Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1333A200B61 for ; Tue, 9 Aug 2016 09:55:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1200F160AAD; Tue, 9 Aug 2016 07:55:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62364160AA4 for ; Tue, 9 Aug 2016 09:55:02 +0200 (CEST) Received: (qmail 63244 invoked by uid 500); 9 Aug 2016 07:55:01 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 63228 invoked by uid 99); 9 Aug 2016 07:55:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2016 07:55:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53D63E0019; Tue, 9 Aug 2016 07:55:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Date: Tue, 09 Aug 2016 07:55:01 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] groovy git commit: GROOVY-7542: CompileStatic class generation bug 'register with message: rightShiftUnsigned and arguments X' archived-at: Tue, 09 Aug 2016 07:55:03 -0000 Repository: groovy Updated Branches: refs/heads/master 584d4d405 -> a1eb2ae58 GROOVY-7542: CompileStatic class generation bug 'register with message: rightShiftUnsigned and arguments X' Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/cba9b426 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/cba9b426 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/cba9b426 Branch: refs/heads/master Commit: cba9b426b47cfb57c36ed2f80229b3ad09d0b74c Parents: 584d4d4 Author: antoaravinth Authored: Sun Aug 16 18:24:47 2015 +0530 Committer: paulk Committed: Tue Aug 9 17:20:08 2016 +1000 ---------------------------------------------------------------------- .../classgen/asm/sc/StaticTypesCallSiteWriter.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/cba9b426/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java index 74a8895..79dea7d 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java @@ -650,6 +650,11 @@ public class StaticTypesCallSiteWriter extends CallSiteWriter implements Opcodes writeModCall(receiver, arguments, rType, aType); return true; } + else if("rightShiftUnsigned".equals(message)) + { + writeShiftOperatorCall(receiver, arguments, rType, aType); + return true; + } } else if (STRING_TYPE.equals(rType) && "plus".equals(message)) { writeStringPlusCall(receiver, message, arguments); return true; @@ -749,7 +754,17 @@ public class StaticTypesCallSiteWriter extends CallSiteWriter implements Opcodes mv.visitMethodInsn(INVOKESTATIC, "org/codehaus/groovy/runtime/typehandling/NumberMath", "mod", "(Ljava/lang/Number;Ljava/lang/Number;)Ljava/lang/Number;", false); controller.getOperandStack().replace(Number_TYPE, 2); } - + + private void writeShiftOperatorCall(Expression receiver, Expression arguments, ClassNode rType, ClassNode aType) { + prepareSiteAndReceiver(receiver, "rightShiftUnsigned", false, controller.getCompileStack().isLHS()); + controller.getOperandStack().doGroovyCast(Number_TYPE); + visitBoxedArgument(arguments); + controller.getOperandStack().doGroovyCast(Number_TYPE); + MethodVisitor mv = controller.getMethodVisitor(); + mv.visitMethodInsn(INVOKESTATIC, "org/codehaus/groovy/runtime/typehandling/NumberMath", "rightShiftUnsigned", "(Ljava/lang/Number;Ljava/lang/Number;)Ljava/lang/Number;", false); + controller.getOperandStack().replace(Number_TYPE, 2); + } + private void writePowerCall(Expression receiver, Expression arguments, final ClassNode rType, ClassNode aType) { OperandStack operandStack = controller.getOperandStack(); int m1 = operandStack.getStackLength();