From a4521c3deae8e95c5ce84b28f3b2bb6e2133741d Mon Sep 17 00:00:00 2001 From: rbackman Date: Mon, 28 Oct 2013 08:34:10 +0100 Subject: [PATCH] 8027353: Exact intrinsics: assert(n != NULL) failed: must not be null Reviewed-by: kvn, roland --- src/share/vm/opto/library_call.cpp | 6 +++--- .../intrinsics/mathexact/SubExactLConstantTest.java | 1 + .../intrinsics/mathexact/SubExactLNonConstantTest.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/share/vm/opto/library_call.cpp b/src/share/vm/opto/library_call.cpp index 6a7ee6288..df6c29f57 100644 --- a/src/share/vm/opto/library_call.cpp +++ b/src/share/vm/opto/library_call.cpp @@ -2006,9 +2006,9 @@ bool LibraryCallKit::inline_math_addExactI(bool is_increment) { Node* arg2 = NULL; if (is_increment) { - arg2 = intcon(1); + arg2 = intcon(1); } else { - arg2 = argument(1); + arg2 = argument(1); } Node* add = _gvn.transform( new(C) AddExactINode(NULL, arg1, arg2) ); @@ -2056,7 +2056,7 @@ bool LibraryCallKit::inline_math_subtractExactL(bool is_decrement) { if (is_decrement) { arg2 = longcon(1); } else { - Node* arg2 = argument(2); // type long + arg2 = argument(2); // type long // argument(3) == TOP } diff --git a/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java b/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java index 46eefcd19..ec554d766 100644 --- a/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java +++ b/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java @@ -24,6 +24,7 @@ /* * @test * @bug 8026844 + * @bug 8027353 * @summary Test constant subtractExact * @compile SubExactLConstantTest.java Verify.java * @run main SubExactLConstantTest diff --git a/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java b/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java index 2bd67bb0f..86ecf20f3 100644 --- a/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java +++ b/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java @@ -24,6 +24,7 @@ /* * @test * @bug 8026844 + * @bug 8027353 * @summary Test non constant subtractExact * @compile SubExactLNonConstantTest.java Verify.java * @run main SubExactLNonConstantTest -- GitLab