# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1363082640 -3600
# Node ID 1112adb28f821047cb9a346e7543909570b0aa72
# Parent  985a97ba083c330f63298fcbdc79a78d150a1566# Parent  2c5df42999dd9236e31f5ff01c1033affdb96679
Merge.

diff -r 2c5df42999dd -r 1112adb28f82 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_idea.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_idea.java	Tue Mar 12 10:02:20 2013 +0100
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/hotpath/HP_idea.java	Tue Mar 12 11:04:00 2013 +0100
@@ -372,7 +372,7 @@
 
     /*
      * private int mul(int a, int b) throws ArithmeticException { long p; // Large enough to catch 16-bit multiply //
-     * without hitting sign bit. if (a != 0) { if(b != 0) { p = (long) a * b; b = (int) p & 0xFFFF; // Lower 16 bits. a
+     * without hitting sign bit. if (a != 0) { if (b != 0) { p = (long) a * b; b = (int) p & 0xFFFF; // Lower 16 bits. a
      * = (int) p >>> 16; // Upper 16 bits.
      *
      * return (b - a + (b < a ? 1 : 0) & 0xFFFF); } else return ((1 - a) & 0xFFFF); // If b = 0, then same as // 0x10001
diff -r 2c5df42999dd -r 1112adb28f82 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Tue Mar 12 10:02:20 2013 +0100
+++ b/src/share/vm/code/nmethod.cpp	Tue Mar 12 11:04:00 2013 +0100
@@ -1923,7 +1923,7 @@
   }
 
 #ifdef GRAAL
-  if(_graal_installed_code != NULL) {
+  if (_graal_installed_code != NULL) {
     f->do_oop((oop*) &_graal_installed_code);
   }
   if (_triggered_deoptimizations != NULL) {
diff -r 2c5df42999dd -r 1112adb28f82 src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Tue Mar 12 10:02:20 2013 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Tue Mar 12 11:04:00 2013 +0100
@@ -85,7 +85,7 @@
       memcpy(reconstituted_code, (jbyte *) method->code_base(), code_size);
     }
     BytecodeStream s(method);
-    while(!s.is_last_bytecode()) {
+    while (!s.is_last_bytecode()) {
       s.next();
       Bytecodes::Code opcode = s.raw_code();
       if (!Bytecodes::is_java_code(opcode)) {
@@ -962,7 +962,7 @@
 // XXX: Attention: it seEms that the line number table of a method just contains lines that are important, means that
 // empty lines are left out or lines that can't have a breakpoint on it; eg int a; or try {
   Method* method = getMethodFromHotSpotMethod(JNIHandles::resolve(hotspot_method));
-  if(!method->has_linenumber_table()) {
+  if (!method->has_linenumber_table()) {
     return NULL;
   }
   u2 num_entries = 0;
@@ -991,7 +991,7 @@
   ResourceMark rm;
 
   Method* method = getMethodFromHotSpotMethod(JNIHandles::resolve(hotspot_method));
-  if(!method->has_localvariable_table()) {
+  if (!method->has_localvariable_table()) {
     return NULL;
   }
   int localvariable_table_length = method->localvariable_table_length();