Mercurial > hg > graal-jvmci-8

diff src/share/vm/opto/graphKit.hpp @ 17810:62c54fcc0a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 25 Mar 2014 17:07:36 -0700
parents a9becfeecd1b 9ab9f254cfe2
children 00c8a1255912
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.hpp	Tue Mar 25 12:54:21 2014 -0700
+++ b/src/share/vm/opto/graphKit.hpp	Tue Mar 25 17:07:36 2014 -0700
@@ -338,6 +338,7 @@
   // Convert between int and long, and size_t.
   // (See macros ConvI2X, etc., in type.hpp for ConvI2X, etc.)
   Node* ConvI2L(Node* offset);
+  Node* ConvI2UL(Node* offset);
   Node* ConvL2I(Node* offset);
   // Find out the klass of an object.
   Node* load_object_klass(Node* object);
@@ -406,7 +407,7 @@
   // Use the type profile to narrow an object type.
   Node* maybe_cast_profiled_receiver(Node* not_null_obj,
                                      ciKlass* require_klass,
-                                    ciKlass* spec,
+                                     ciKlass* spec,
                                      bool safe_for_replace);
 
   // Cast obj to type and emit guard unless we had too many traps here already