Mercurial > hg > graal-jvmci-8

diff src/share/vm/c1/c1_GraphBuilder.cpp @ 14726:92aa6797d639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out merge changeset: b51e29501f30 Backed out merge revision to its first parent (8f483e200405)
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Mar 2014 21:30:43 +0100
parents b51e29501f30
children
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Mar 21 16:36:59 2014 -0700
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Mon Mar 24 21:30:43 2014 +0100
@@ -1436,7 +1436,7 @@
 
   bool need_mem_bar = false;
   if (method()->name() == ciSymbol::object_initializer_name() &&
-      (scope()->wrote_final() || (AlwaysSafeConstructors && scope()->wrote_fields()))) {
+      scope()->wrote_final()) {
     need_mem_bar = true;
   }
 
@@ -1550,10 +1550,6 @@
     scope()->set_wrote_final();
   }
 
-  if (code == Bytecodes::_putfield) {
-    scope()->set_wrote_fields();
-  }
-
   const int offset = !needs_patching ? field->offset() : -1;
   switch (code) {
     case Bytecodes::_getstatic: {
@@ -3773,14 +3769,11 @@
   }
 
   // now perform tests that are based on flag settings
-  if (callee->force_inline() || callee->should_inline()) {
-    if (inline_level() > MaxForceInlineLevel                    ) INLINE_BAILOUT("MaxForceInlineLevel");
-    if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("recursive inlining too deep");
-
-    const char* msg = "";
-    if (callee->force_inline())  msg = "force inline by annotation";
-    if (callee->should_inline()) msg = "force inline by CompileOracle";
-    print_inlining(callee, msg);
+  if (callee->force_inline()) {
+    if (inline_level() > MaxForceInlineLevel) INLINE_BAILOUT("MaxForceInlineLevel");
+    print_inlining(callee, "force inline by annotation");
+  } else if (callee->should_inline()) {
+    print_inlining(callee, "force inline by CompileOracle");
   } else {
     // use heuristic controls on inlining
     if (inline_level() > MaxInlineLevel                         ) INLINE_BAILOUT("inlining too deep");