Merge branch 'master' into deopt

jruby · Jan 24, 2017 · 3a9967e · 3a9967e
2 parents b59a143 + dffc23c
commit 3a9967e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -359,7 +359,7 @@ private void emitWithSignatures(IRMethod method, JVMVisitorMethodContext context
             emitScope(method, name, signature, false, true);
             context.addNativeSignature(-1, signature.type());
         } else {
-            emitScope(method, name, specificSig, true, false);
+            emitScope(method, name, specificSig, true, true);
             context.addNativeSignature(method.getStaticScope().getSignature().required(), specificSig.type());
             emitVarargsMethodWrapper(method, name, METHOD_SIGNATURE_VARARGS, specificSig);
             context.addNativeSignature(-1, METHOD_SIGNATURE_VARARGS.type());

diff --git a/pom.rb b/pom.rb
@@ -26,8 +26,8 @@
     archives "https://github.com/jruby/jruby/wiki/MailingLists"
   end
 
-  license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'
-  license 'LGPL 3', 'http://www.gnu.org/licenses/lgpl-3.0-standalone.html'
+  license 'GPL 2', 'http://www.gnu.org/licenses/gpl-2.0-standalone.html'
+  license 'LGPL 2.1', 'http://www.gnu.org/licenses/lgpl-2.1-standalone.html'
   license 'EPL', 'http://www.eclipse.org/legal/epl-v10.html'
 
   plugin_repository( :url => 'https://oss.sonatype.org/content/repositories/snapshots/',

diff --git a/pom.xml b/pom.xml
@@ -28,12 +28,12 @@ DO NOT MODIFIY - GENERATED CODE
   </organization>
   <licenses>
     <license>
-      <name>GPL 3</name>
-      <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
+      <name>GPL 2</name>
+      <url>http://www.gnu.org/licenses/gpl-2.0-standalone.html</url>
     </license>
     <license>
-      <name>LGPL 3</name>
-      <url>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</url>
+      <name>LGPL 2.1</name>
+      <url>http://www.gnu.org/licenses/lgpl-2.1-standalone.html</url>
     </license>
     <license>
       <name>EPL</name>