# HG changeset patch
# User lana
# Date 1363314399 25200
# Node ID 5ee744831dcb81a4eba7b4b769803b9b40382370
# Parent  11d5942ef9c7726a525ec45dbd6ff5fd93ebd013# Parent  f1629878512f1f2ce74019f8c712a96610797e6d
Merge

diff -r f1629878512f -r 5ee744831dcb src/share/vm/interpreter/linkResolver.cpp
--- a/src/share/vm/interpreter/linkResolver.cpp	Thu Mar 14 15:00:19 2013 -0700
+++ b/src/share/vm/interpreter/linkResolver.cpp	Thu Mar 14 19:26:39 2013 -0700
@@ -803,7 +803,7 @@
     if (!direct_calling_default_method &&
         check_access &&
         // a) check if ACC_SUPER flag is set for the current class
-        current_klass->is_super() &&
+        (current_klass->is_super() || !AllowNonVirtualCalls) &&
         // b) check if the method class is a superclass of the current class (superclass relation is not reflexive!)
         current_klass->is_subtype_of(method_klass()) &&
         current_klass() != method_klass() &&
diff -r f1629878512f -r 5ee744831dcb src/share/vm/opto/loopTransform.cpp
diff -r f1629878512f -r 5ee744831dcb src/share/vm/runtime/arguments.cpp
diff -r f1629878512f -r 5ee744831dcb src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu Mar 14 15:00:19 2013 -0700
+++ b/src/share/vm/runtime/globals.hpp	Thu Mar 14 19:26:39 2013 -0700
@@ -3644,7 +3644,10 @@
           "Enable internal testing APIs")                                   \
                                                                             \
   product(bool, PrintGCCause, true,                                         \
-          "Include GC cause in GC logging")
+          "Include GC cause in GC logging")                                 \
+                                                                            \
+  product(bool, AllowNonVirtualCalls, false,                                \
+          "Obey the ACC_SUPER flag and allow invokenonvirtual calls")
 
 /*
  *  Macros for factoring of globals