diff -r 60853c6a93b7 -r 825bfb41920c hotspot/src/share/vm/opto/divnode.cpp
--- a/hotspot/src/share/vm/opto/divnode.cpp	Tue May 05 11:02:10 2009 -0700
+++ b/hotspot/src/share/vm/opto/divnode.cpp	Wed May 06 12:04:42 2009 -0700
@@ -298,8 +298,10 @@
 
   // 6732154: Construct both w1 and w2 before transforming, so t
   // doesn't go dead prematurely.
+  // 6837011: We need to transform w2 before w1 because the
+  // transformation of w1 could return t.
+  w2 = phase->transform(w2);
   w1 = phase->transform(w1);
-  w2 = phase->transform(w2);
 
   // w1 = u0*v1 + w1;
   Node* u0v1 = phase->transform(new (phase->C, 3) MulLNode(u0, v1));