# HG changeset patch
# User ewendeli
# Date 1361306709 -3600
# Node ID 1cabf9c80e849d6a4ffcf0c4eb2c0674284a3705
# Parent  cdb46031e7184d37301288f5719121a63c7054b5# Parent  b5cb079ecaa4006688e18113b13e0277e2b66138
Merge

diff -r cdb46031e718 -r 1cabf9c80e84 src/share/vm/interpreter/linkResolver.cpp
--- a/src/share/vm/interpreter/linkResolver.cpp	Fri Feb 08 08:07:07 2013 -0800
+++ b/src/share/vm/interpreter/linkResolver.cpp	Tue Feb 19 21:45:09 2013 +0100
@@ -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 cdb46031e718 -r 1cabf9c80e84 src/share/vm/opto/loopTransform.cpp
diff -r cdb46031e718 -r 1cabf9c80e84 src/share/vm/runtime/arguments.cpp
diff -r cdb46031e718 -r 1cabf9c80e84 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri Feb 08 08:07:07 2013 -0800
+++ b/src/share/vm/runtime/globals.hpp	Tue Feb 19 21:45:09 2013 +0100
@@ -3634,7 +3634,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