Bug 545756 - Fix initialization of constant expressions

- propagate associatedNumericalValue in sizeof()
- set associatedNumericalValue from LiteralExpression

Change-Id: Ibf1fdb70e7bbbb889113f337a0b12532c5040300
Signed-off-by: Hannes Vogt <hannes@havogt.de>

3 files changed, 14 insertions, 2 deletions

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AggregateInitialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AggregateInitialization.java
index e3afebd2e6b..d18585b19d5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AggregateInitialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AggregateInitialization.java
@@ -76,7 +76,7 @@ class AggregateInitialization {
 			if (!cost.converts()) {
 				return cost;
 			}
-			// If the initializer-clause is an expression and a narrowing conversion is
+			// [dcl.init.aggr] If the initializer-clause is an expression and a narrowing conversion is
 			// required to convert the expression, the program is ill-formed.
 			if (!(initializer instanceof EvalInitList) && cost.isNarrowingConversion()) {
 				return Cost.NO_CONVERSION;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
index 4a735d94472..fd240c4c9d6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
@@ -67,6 +67,7 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializer;
 import org.eclipse.cdt.core.dom.ast.IASTInitializerClause;
 import org.eclipse.cdt.core.dom.ast.IASTInitializerList;
 import org.eclipse.cdt.core.dom.ast.IASTLabelStatement;
+import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNamedTypeSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
@@ -2148,6 +2149,14 @@ public class CPPVisitor extends ASTQueries {
 			IASTNode initClause = declarator.getInitializer();
 			if (initClause instanceof IASTEqualsInitializer) {
 				initClause = ((IASTEqualsInitializer) initClause).getInitializerClause();
+				if (initClause instanceof IASTLiteralExpression && SemanticUtil.isConst(type)) {
+					IType t = SemanticUtil.getNestedType(type, TDEF | ALLCVQ);
+					if (t instanceof CPPBasicType) {
+						IValue v = SemanticUtil.getValueOfInitializer(declarator.getInitializer(), t);
+						if (v.numberValue() != null)
+							((CPPBasicType) t).setAssociatedNumericalValue(v.numberValue().longValue());
+					}
+				}
 			}
 			if (initClause instanceof IASTInitializerList) {
 				IType t = SemanticUtil.getNestedType(type, TDEF);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java
index bf8bb5ca297..e08dce34c89 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUnaryTypeID.java
@@ -160,7 +160,10 @@ public class EvalUnaryTypeID extends CPPDependentEvaluation {
 		case op_sizeof:
 		case op_sizeofParameterPack:
 		case op_alignof:
-			return CPPVisitor.get_SIZE_T();
+			CPPBasicType t = (CPPBasicType) CPPVisitor.get_SIZE_T().clone();
+			if (getValue().numberValue() != null)
+				t.setAssociatedNumericalValue(getValue().numberValue().longValue());
+			return t;
 		case op_typeid:
 			return CPPVisitor.get_type_info();
 		case op_has_nothrow_copy: