Mercurial > hg > graal-compiler

diff graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2534:4af63190ee3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prohibit inlining of synchronized and inlining of method with exception handlers (remove C1XOption).
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 27 Apr 2011 19:25:26 +0200
parents c480605ef068
children 4a016ff4d2df
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Wed Apr 27 19:05:35 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Wed Apr 27 19:25:26 2011 +0200
@@ -1055,7 +1055,6 @@
             if (isSynchronized(method().accessFlags())) {
                 // if the inlined method is synchronized, then the monitor
                 // must be released before jumping to the continuation point
-                assert C1XOptions.OptInlineSynchronized;
                 Value object = curState.lockAt(0);
                 if (object instanceof Instruction) {
                     Instruction obj = (Instruction) object;
@@ -1469,10 +1468,10 @@
         if (compilation.runtime.mustNotCompile(target)) {
             return cannotInline(target, "compile excluded by runtime");
         }
-        if (isSynchronized(target.accessFlags()) && !C1XOptions.OptInlineSynchronized) {
+        if (isSynchronized(target.accessFlags())) {
             return cannotInline(target, "is synchronized");
         }
-        if (target.exceptionHandlers().length != 0 && !C1XOptions.OptInlineExcept) {
+        if (target.exceptionHandlers().length != 0) {
             return cannotInline(target, "has exception handlers");
         }
         if (!target.hasBalancedMonitors()) {