From ce2c7320902a573f64449e7382021a63095d9bcb Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Mon, 24 Oct 2011 14:16:32 -0700
Subject: [PATCH] Fixed NPE.

---
 .../cdt/internal/core/dom/parser/SizeofCalculator.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java
index 43e1a483a78..2f56fb701de 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java
@@ -24,6 +24,7 @@ import org.eclipse.cdt.core.dom.ast.IEnumeration;
 import org.eclipse.cdt.core.dom.ast.IField;
 import org.eclipse.cdt.core.dom.ast.IPointerType;
 import org.eclipse.cdt.core.dom.ast.IType;
+import org.eclipse.cdt.core.dom.ast.IValue;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPBasicType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
@@ -180,7 +181,10 @@ public class SizeofCalculator {
 	}
 
 	private SizeAndAlignment sizeAndAlignment(IArrayType type) {
-		Long numElements = type.getSize().numericalValue();
+		IValue value = type.getSize();
+		if (value == null)
+			return null;
+		Long numElements = value.numericalValue();
 		if (numElements == null)
 			return null;
 		IType elementType = type.getType();
@@ -194,7 +198,7 @@ public class SizeofCalculator {
 
 	private SizeAndAlignment sizeAndAlignment(ICompositeType type) {
 		/* TODO(sprigogin): May produce incorrect result for structures containing bit fields.
-		 * Unfortunately widths of bit fields is not preserved in the AST. */
+		 * Unfortunately widths of bit fields are not preserved in the AST. */
 		long size = 0;
 		int maxAlignment = 1;
 		IField[] fields;