You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/09/12 16:26:31 UTC

[groovy] 18/19: GROOVY-9704: load minus one as long integer (closes #1358)

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 3184da923cb6557759cfe35ba26e55db62adc060
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Aug 31 12:01:43 2020 -0500

    GROOVY-9704: load minus one as long integer (closes #1358)
    
    (cherry picked from commit cdee610a78f03eb3acb70664b98f49eba22b6bc9)
---
 .../groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java        | 2 +-
 src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java
index a46bf94..54d75fe 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java
@@ -62,7 +62,7 @@ public class StaticTypesUnaryExpressionHelper extends UnaryExpressionHelper impl
         if (top == int_TYPE || top == long_TYPE || top == short_TYPE || top == byte_TYPE || top == char_TYPE) {
             bytecodeX(mv -> {
                 if (top == long_TYPE) {
-                    mv.visitLdcInsn(-1);
+                    mv.visitLdcInsn(-1L);
                     mv.visitInsn(LXOR);
                 } else {
                     mv.visitInsn(ICONST_M1);
diff --git a/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy b/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy
index b4854c6..6768f5e 100644
--- a/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy
+++ b/src/test/groovy/transform/stc/UnaryOperatorSTCTest.groovy
@@ -61,7 +61,7 @@ class UnaryOperatorSTCTest extends StaticTypeCheckingTestCase {
     }
 
     // GROOVY-9704
-    void _FIXME_testBitwiseNegate_long() {
+    void testBitwiseNegate_long() {
         assertScript '''
             long x = 1L
             assert ~x == -2L