Fix Bug 240537 (eclipse-jdt#2211)

- add checks in CallInliner.computeRealArguments() when adding local
  variables to add instanceof check for the variable if it is a cast
  expression and the initial invocation is in a conditional with
  instanceof checking
- add new test to InlineMethodTests
- fixes eclipse-jdt#2210

Author: jjohnstn

org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/CallInliner.java

@@ -58,6 +58,7 @@
 import org.eclipse.jdt.core.dom.BodyDeclaration;
 import org.eclipse.jdt.core.dom.CastExpression;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.ConditionalExpression;
 import org.eclipse.jdt.core.dom.DoStatement;
 import org.eclipse.jdt.core.dom.EnhancedForStatement;
 import org.eclipse.jdt.core.dom.Expression;
@@ -69,6 +70,7 @@
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.IfStatement;
+import org.eclipse.jdt.core.dom.InstanceofExpression;
 import org.eclipse.jdt.core.dom.LabeledStatement;
 import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
@@ -104,6 +106,7 @@
 import org.eclipse.jdt.internal.corext.codemanipulation.ContextSensitiveImportRewriteContext;
 import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;
 import org.eclipse.jdt.internal.corext.dom.ASTNodes;
+import org.eclipse.jdt.internal.corext.dom.AbortSearchException;
 import org.eclipse.jdt.internal.corext.dom.CodeScopeBuilder;
 import org.eclipse.jdt.internal.corext.dom.HierarchicalASTVisitor;
 import org.eclipse.jdt.internal.corext.dom.LocalVariableIndex;
@@ -518,6 +521,14 @@ public TextEdit getModifications() {
 		return fRewrite.rewriteAST(fBuffer.getDocument(), fCUnit.getOptions(true));
 	}
 
+
+	private class InstanceofChecker extends ASTVisitor {
+		@Override
+		public boolean visit(InstanceofExpression node) {
+			throw new AbortSearchException();
+		}
+	}
+
 	private void computeRealArguments() {
 		List<Expression> arguments= Invocations.getArguments(fInvocation);
 		Set<Expression> canNotInline= crossCheckArguments(arguments);
@@ -533,7 +544,36 @@ private void computeRealArguments() {
 			} else {
 				String name= fInvocationScope.createName(parameter.getName(), true);
 				realArguments[i]= ast.newSimpleName(name);
-				VariableDeclarationStatement local= createLocalDeclaration(parameter.getTypeBinding(), name, (Expression) fRewrite.createCopyTarget(expression));
+				boolean needInstanceofCheck= false;
+				if (expression instanceof CastExpression) {
+					ASTNode ancestor= ASTNodes.getFirstAncestorOrNull(fInvocation, ConditionalExpression.class, Statement.class);
+					while (ancestor instanceof ConditionalExpression condExp) {
+						InstanceofChecker checker= new InstanceofChecker();
+						Expression posExp= condExp.getExpression();
+						try {
+							posExp.accept(checker);
+						} catch (AbortSearchException e) {
+							needInstanceofCheck= true;
+							break;
+						}
+					}
+				}
+				Expression newExp= null;
+				if (needInstanceofCheck) {
+					CastExpression castExp= (CastExpression)expression;
+					Type t= castExp.getType();
+					InstanceofExpression instExp= ast.newInstanceofExpression();
+					instExp.setRightOperand((Type) fRewrite.createCopyTarget(t));
+					instExp.setLeftOperand((Expression)fRewrite.createCopyTarget(castExp.getExpression()));
+					ConditionalExpression condExp= ast.newConditionalExpression();
+					condExp.setExpression(instExp);
+					condExp.setThenExpression((Expression)fRewrite.createCopyTarget(expression));
+					condExp.setElseExpression(ast.newNullLiteral());
+					newExp= condExp;
+				} else {
+					newExp= (Expression)fRewrite.createCopyTarget(expression);
+				}
+				VariableDeclarationStatement local= createLocalDeclaration(parameter.getTypeBinding(), name, newExp);
 				if (parameter.isFinal()) {
 					local.modifiers().add(fInvocation.getAST().newModifier(ModifierKeyword.FINAL_KEYWORD));
 				}

org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_issue_2210.java

@@ -0,0 +1,29 @@
+package bugs_in;
+
+public class Test_issue_2210 {
+	enum EntityType{X}
+	static class Case extends Bug{}
+	static class Leaf extends Bug{}
+	static class CaseNote extends Leaf{}
+	static class SuperView extends Leaf{}
+	static class CaseEntity extends Leaf{
+		EntityType getEntityType(){return null;}
+	}
+	public static void main(String...args){
+		System.out.println(fetch(new Case()));
+	}
+	static String /*]*/getId/*[*/(final Leaf leaf){ // LINE 13
+		return leaf instanceof CaseNote?"a":
+	       leaf instanceof CaseEntity?
+		   editorId(((CaseEntity)leaf).
+		   getEntityType()):"b";
+	}
+	static String editorId(final EntityType type){
+		return""+type;
+	}
+	static String fetch(final Bug record){
+		return record instanceof SuperView?"c":
+			   record instanceof Case?
+			   "DONE!":getId((Leaf)record);
+	}
+}

org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_issue_2210.java

@@ -0,0 +1,27 @@
+package bugs_in;
+
+public class Test_issue_2210 {
+	enum EntityType{X}
+	static class Case extends Bug{}
+	static class Leaf extends Bug{}
+	static class CaseNote extends Leaf{}
+	static class SuperView extends Leaf{}
+	static class CaseEntity extends Leaf{
+		EntityType getEntityType(){return null;}
+	}
+	public static void main(String...args){
+		System.out.println(fetch(new Case()));
+	}
+	static String editorId(final EntityType type){
+		return""+type;
+	}
+	static String fetch(final Bug record){
+		final Leaf leaf = record instanceof Leaf ? (Leaf)record : null;
+		return record instanceof SuperView?"c":
+			   record instanceof Case?
+			   "DONE!":leaf instanceof CaseNote?"a":
+			   leaf instanceof CaseEntity?
+			   editorId(((CaseEntity)leaf).
+			   getEntityType()):"b";
+	}
+}

org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java

@@ -527,6 +527,11 @@ public void test_issue_2118_3() throws Exception {
 		performBugTest();
 	}
 
+	@Test
+	public void test_issue_2210() throws Exception {
+		performBugTest();
+	}
+
 	/* *********************** Argument Tests ******************************* */
 
 	private void performArgumentTest() throws Exception {