# HG changeset patch
# User lana
# Date 1363137760 25200
# Node ID 11d5942ef9c7726a525ec45dbd6ff5fd93ebd013
# Parent  65b797426a3bec6e91b64085a0cfb94adadb634a# Parent  d4a32a6f8c820aa976e2f7d1de79bb6380b8c256
Merge

diff -r 65b797426a3b -r 11d5942ef9c7 src/share/vm/interpreter/linkResolver.cpp
--- a/src/share/vm/interpreter/linkResolver.cpp	Fri Mar 08 08:10:01 2013 -0800
+++ b/src/share/vm/interpreter/linkResolver.cpp	Tue Mar 12 18:22:40 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 65b797426a3b -r 11d5942ef9c7 src/share/vm/opto/loopTransform.cpp
diff -r 65b797426a3b -r 11d5942ef9c7 src/share/vm/runtime/arguments.cpp
diff -r 65b797426a3b -r 11d5942ef9c7 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri Mar 08 08:10:01 2013 -0800
+++ b/src/share/vm/runtime/globals.hpp	Tue Mar 12 18:22:40 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