From 3ed176d0c273b7b5e4d2ad2bb7dd56166078f858 Mon Sep 17 00:00:00 2001
From: Nathan Ridge <zeratul976@hotmail.com>
Date: Sun, 8 Jul 2018 14:27:15 -0400
Subject: [PATCH] Bug 536805 - NPE in CPPEvaluation.maybeApplyConversion()

Change-Id: I42e780f90aacf9383b722a8b82e441d4032d14e7
---
 .../internal/core/dom/parser/cpp/semantics/CPPEvaluation.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java
index d9144c8f84a..be9b4d90b20 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPEvaluation.java
@@ -172,6 +172,10 @@ public abstract class CPPEvaluation implements ICPPEvaluation {
 	 */
 	protected static ICPPEvaluation maybeApplyConversion(ICPPEvaluation argument, IType targetType,
 			boolean allowContextualConversion) {
+		if (targetType == null) {
+			return argument;
+		}
+		
 		IType type = argument.getType();
 		
 		// Types match - don't bother to check for conversions.