diff -r f8236e79048a -r ff5961f4c095 src/share/vm/opto/type.hpp
--- a/src/share/vm/opto/type.hpp	Wed Dec 05 09:00:00 2007 -0800
+++ b/src/share/vm/opto/type.hpp	Wed Dec 05 09:01:00 2007 -0800
@@ -1070,6 +1070,7 @@
 #define LShiftXNode  LShiftLNode
 // For object size computation:
 #define AddXNode     AddLNode
+#define RShiftXNode  RShiftLNode
 // For card marks and hashcodes
 #define URShiftXNode URShiftLNode
 // Opcodes
@@ -1108,6 +1109,7 @@
 #define LShiftXNode  LShiftINode
 // For object size computation:
 #define AddXNode     AddINode
+#define RShiftXNode  RShiftINode
 // For card marks and hashcodes
 #define URShiftXNode URShiftINode
 // Opcodes