commit f05fc94ba54f1521b5561b195a8403d82c52a000
author Stephan Herrmann <stephan.herrmann@berlin.de> Sat Feb 29 17:54:30 2020 +0100
committer Stephan Herrmann <stephan.herrmann@berlin.de> Sat Feb 29 17:54:30 2020 +0100
tree 721a120b534f1d5bd100f644ee45bb192cb12121
parent 751d5dec0804e52e773fb86fc86013d88b6f4a4a

Bug 560657 - Lowering doesn't work for ConditionalExpression

org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/InsertTypeAdjustmentsVisitor.java

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/InsertTypeAdjustmentsVisitor.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/InsertTypeAdjustmentsVisitor.java
index 6fd206b..4c2938a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/InsertTypeAdjustmentsVisitor.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/statemachine/transformer/InsertTypeAdjustmentsVisitor.java
@@ -322,7 +322,7 @@
             TypeBinding expectedType)
     {
         Expression newExpr=null;
-        if (expr != null) {
+        if (expr != null && expr.resolvedType != null) {
         	Config oldConfig = Config.createOrResetConfig(this);
             try {
 	            expr.resolvedType.isCompatibleWith(expectedType); // just recheck.