diff src/share/vm/opto/type.cpp @ 1543:1a1603f975b5

Merge
author kvn
date Wed, 19 May 2010 10:22:39 -0700
parents 5b29c2368d93
children c18cbe5936b8
line wrap: on
line diff
--- a/src/share/vm/opto/type.cpp	Mon Apr 05 10:17:15 2010 -0700
+++ b/src/share/vm/opto/type.cpp	Wed May 19 10:22:39 2010 -0700
@@ -2545,12 +2545,15 @@
       ftip->is_loaded() &&  ftip->klass()->is_interface() &&
       ktip->is_loaded() && !ktip->klass()->is_interface()) {
     // Happens in a CTW of rt.jar, 320-341, no extra flags
+    assert(!ftip->klass_is_exact(), "interface could not be exact");
     return ktip->cast_to_ptr_type(ftip->ptr());
   }
+  // Interface klass type could be exact in opposite to interface type,
+  // return it here instead of incorrect Constant ptr J/L/Object (6894807).
   if (ftkp != NULL && ktkp != NULL &&
       ftkp->is_loaded() &&  ftkp->klass()->is_interface() &&
+      !ftkp->klass_is_exact() && // Keep exact interface klass
       ktkp->is_loaded() && !ktkp->klass()->is_interface()) {
-    // Happens in a CTW of rt.jar, 320-341, no extra flags
     return ktkp->cast_to_ptr_type(ftkp->ptr());
   }