From a830f285fe92a58fb9689020c3ddc605b0d36867 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 8 Dec 2014 18:22:13 -0800 Subject: [PATCH] Revert "Bug 451091 - Make type of constexpr variable const-qualified" This reverts commit 39dce1d497a2508f5bb48c6839bab80127fe52ac. --- .../eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java | 8 -------- .../core/dom/parser/cpp/semantics/CPPVisitor.java | 5 +---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java index 795f2f8a32d..4e05e2cf07c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java @@ -10978,12 +10978,4 @@ public class AST2CPPTests extends AST2TestBase { IASTSimpleDeclaration sd = (IASTSimpleDeclaration) tu.getDeclarations()[0]; isParameterSignatureEqual(sd.getDeclarators()[0], "(int&&)"); } - - // constexpr int waldo = 42; - public void testConstexprVariableIsConst_451091() throws Exception { - BindingAssertionHelper helper = getAssertionHelper(); - ICPPVariable waldo = helper.assertNonProblem("waldo"); - assertInstance(waldo.getType(), IQualifierType.class); - assertTrue(((IQualifierType) waldo.getType()).isConst()); - } } 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 c64e57f3c90..8c64db5ec4f 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 @@ -2240,10 +2240,7 @@ public class CPPVisitor extends ASTQueries { } private static IType qualifyType(IType type, IASTDeclSpecifier declSpec) { - boolean isConst = declSpec.isConst() - || (declSpec instanceof ICPPASTDeclSpecifier - && ((ICPPASTDeclSpecifier) declSpec).isConstexpr()); - return SemanticUtil.addQualifiers(type, isConst, declSpec.isVolatile(), declSpec.isRestrict()); + return SemanticUtil.addQualifiers(type, declSpec.isConst(), declSpec.isVolatile(), declSpec.isRestrict()); } private static IType createType(IType baseType, IASTDeclarator declarator) {