# HG changeset patch
# User thartmann
# Date 1542809121 -3600
# Node ID 85283f9565dabc82c622f6e95e213f7c8f873b47
# Parent  f94ac11610b3fc25afc4a9fdfb7df8cf697a766a
8214025: assert(t->singleton()) failed: must be a constant when ScavengeRootsInCode < 2
Summary: Added missing null checks and checks for pending exception.
Reviewed-by: kvn

diff -r f94ac11610b3 -r 85283f9565da src/hotspot/share/opto/doCall.cpp
--- a/src/hotspot/share/opto/doCall.cpp	Wed Nov 21 14:24:31 2018 +0530
+++ b/src/hotspot/share/opto/doCall.cpp	Wed Nov 21 15:05:21 2018 +0100
@@ -470,7 +470,7 @@
   // Push appendix argument (MethodType, CallSite, etc.), if one.
   if (iter().has_appendix()) {
     ciObject* appendix_arg = iter().get_appendix();
-    const TypeOopPtr* appendix_arg_type = TypeOopPtr::make_from_constant(appendix_arg);
+    const TypeOopPtr* appendix_arg_type = TypeOopPtr::make_from_constant(appendix_arg, /* require_const= */ true);
     Node* appendix_arg_node = _gvn.makecon(appendix_arg_type);
     push(appendix_arg_node);
   }
diff -r f94ac11610b3 -r 85283f9565da test/hotspot/jtreg/compiler/arguments/TestScavengeRootsInCode.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/arguments/TestScavengeRootsInCode.java	Wed Nov 21 15:05:21 2018 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8214025
+ * @summary Test compilation with non-default value for ScavengeRootsInCode.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:-TieredCompilation
+ *                   -XX:ScavengeRootsInCode=1 compiler.arguments.TestScavengeRootsInCode
+ */
+
+package compiler.arguments;
+
+public class TestScavengeRootsInCode {
+
+    static public void main(String[] args) {
+        System.out.println("Passed");
+    }
+}
+