Mercurial > hg > truffle

diff src/share/vm/c1/c1_GraphBuilder.cpp @ 2014:4de5f4101cfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author iveresov
date Wed, 08 Dec 2010 17:50:49 -0800
parents 5ddfcf4b079e
children 8012aa3ccede 403dc4c1d7f5
line wrap: on
line diff
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Dec 08 04:50:35 2010 -0800
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Wed Dec 08 17:50:49 2010 -0800
@@ -2795,7 +2795,7 @@
       get = append(new UnsafeGetRaw(as_BasicType(local->type()), e,
                                     append(new Constant(new IntConstant(offset))),
                                     0,
-                                    true));
+                                    true /*unaligned*/, true /*wide*/));
     }
     _state->store_local(index, get);
   }
@@ -3377,6 +3377,9 @@
     INLINE_BAILOUT("total inlining greater than DesiredMethodLimit");
   }
 
+  if (is_profiling() && !callee->ensure_method_data()) {
+    INLINE_BAILOUT("mdo allocation failed");
+  }
 #ifndef PRODUCT
       // printing
   if (PrintInlining) {