# HG changeset patch
# User kvn
# Date 1229637599 28800
# Node ID eb811d2ef72e31339b80271378c47a39230c6f26
# Parent  6c345e1c5992a773ebf995b5c408ca030ae40e92# Parent  5496e074077f2c3ba6d245108598094befac4f61
Merge

diff -r 6c345e1c5992 -r eb811d2ef72e src/share/vm/opto/compile.cpp
--- a/src/share/vm/opto/compile.cpp	Wed Dec 17 14:09:39 2008 -0800
+++ b/src/share/vm/opto/compile.cpp	Thu Dec 18 13:59:59 2008 -0800
@@ -2192,7 +2192,9 @@
 
   case Op_DecodeN:
     assert(!n->in(1)->is_EncodeP(), "should be optimized out");
-    assert(n->in(0) == NULL, "no control");
+    // DecodeN could be pinned on Sparc where it can't be fold into
+    // an address expression, see the code for Op_CastPP above.
+    assert(n->in(0) == NULL || !Matcher::clone_shift_expressions, "no control except on sparc");
     break;
 
   case Op_EncodeP: {