diff -r aba91a731143 -r 1d7922586cf6 src/share/vm/opto/escape.hpp
--- a/src/share/vm/opto/escape.hpp	Mon Jul 23 13:04:59 2012 -0700
+++ b/src/share/vm/opto/escape.hpp	Tue Jul 24 10:51:00 2012 -0700
@@ -512,13 +512,11 @@
       assert(ptn != NULL, "node should be registered");
     }
     add_edge(ptnode_adr(n->_idx), ptn);
-  }
-
+ }
   // Helper functions
-  bool   is_oop_field(Node* n, int offset);
-  static Node* get_addp_base(Node *addp);
-  static Node* find_second_addp(Node* addp, Node* n);
-
+  bool   is_oop_field(Node* n, int offset, bool* unsafe);
+ static Node* get_addp_base(Node *addp);
+ static Node* find_second_addp(Node* addp, Node* n);
   // offset of a field reference
   int address_offset(Node* adr, PhaseTransform *phase);