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 A7630200D21 for ; Mon, 2 Oct 2017 03:02:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A5DA31609D9; Mon, 2 Oct 2017 01:02:08 +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 EB5F31609C8 for ; Mon, 2 Oct 2017 03:02:07 +0200 (CEST) Received: (qmail 97108 invoked by uid 500); 2 Oct 2017 01:02:07 -0000 Mailing-List: contact notifications-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 notifications@groovy.apache.org Received: (qmail 97099 invoked by uid 99); 2 Oct 2017 01:02:07 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Oct 2017 01:02:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 758061A23FB for ; Mon, 2 Oct 2017 01:02:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -100.002 X-Spam-Level: X-Spam-Status: No, score=-100.002 tagged_above=-999 required=6.31 tests=[RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id mEQzMmIKquYD for ; Mon, 2 Oct 2017 01:02:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id C576061023 for ; Mon, 2 Oct 2017 01:02:03 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id BB0FCE0F1F for ; Mon, 2 Oct 2017 01:02:02 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 4A4D124321 for ; Mon, 2 Oct 2017 01:01:57 +0000 (UTC) Date: Mon, 2 Oct 2017 01:01:57 +0000 (UTC) From: "Eric Milles (JIRA)" To: notifications@groovy.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Created] (GROOVY-8337) STC: instanceof in ternary expression not propagating type info to true expression MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Mon, 02 Oct 2017 01:02:08 -0000 Eric Milles created GROOVY-8337: ----------------------------------- Summary: STC: instanceof in ternary expression not propagating type info to true expression Key: GROOVY-8337 URL: https://issues.apache.org/jira/browse/GROOVY-8337 Project: Groovy Issue Type: Bug Components: Static Type Checker Reporter: Eric Milles Priority: Minor {code} @CompileStatic class Static { Number n BigDecimal meth() { return n == null || n instanceof BigDecimal ? n : new BigDecimal(n.toString()) } } {code} StaticTypeCheckingVisitor is missing the temporary type of the true expression part of the ternary expression because it pops before accessing the type. One possible solution: {code} @Override public void visitTernaryExpression(final TernaryExpression expression) { Map> oldTracker = pushAssignmentTracking(); // create a new temporary element in the if-then-else type info typeCheckingContext.pushTemporaryTypeInfo(); expression.getBooleanExpression().visit(this); Expression trueExpression = expression.getTrueExpression(); Expression falseExpression = expression.getFalseExpression(); trueExpression.visit(this); // GRECLIPSE add final ClassNode typeOfTrue = findCurrentInstanceOfClass(trueExpression, getType(trueExpression)); // GRECLIPSE end // pop if-then-else temporary type info typeCheckingContext.popTemporaryTypeInfo(); falseExpression.visit(this); ClassNode resultType; if (isNullConstant(trueExpression) || isNullConstant(falseExpression)) { BinaryExpression enclosingBinaryExpression = typeCheckingContext.getEnclosingBinaryExpression(); if (enclosingBinaryExpression != null && enclosingBinaryExpression.getRightExpression()==expression) { resultType = getType(enclosingBinaryExpression.getLeftExpression()); } else if (isNullConstant(trueExpression) && isNullConstant(falseExpression)) { resultType = OBJECT_TYPE; } else if (isNullConstant(trueExpression)) { resultType = wrapTypeIfNecessary(getType(falseExpression)); } else { resultType = wrapTypeIfNecessary(getType(trueExpression)); } } else { // store type information // GRECLIPSE edit //final ClassNode typeOfTrue = getType(trueExpression); // GRECLIPSE end final ClassNode typeOfFalse = getType(falseExpression); resultType = lowestUpperBound(typeOfTrue, typeOfFalse); } storeType(expression, resultType); popAssignmentTracking(oldTracker); } {code} -- This message was sent by Atlassian JIRA (v6.4.14#64029)