Changeset 6896548 for src/AST/Expr.cpp

Timestamp:

Jun 13, 2019, 3:56:24 PM (5 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6a1dfda

Parents:

d76f32c

Message:

Fixed convert-convert issues with strings, when conversion happens after resolve. Three specific issues fixed.

1. String literals were not roundtripping new-old-new with the original type at the constant level, whereas the resolver changes the expression-level type from array to pointer.
2. String literals were roundtripping with noise on a "--print astexpr" diff, with the char-array's index type coming up signed int (expecting unsigned long long int).
3. Function calls that pass a foo[] variable as argument to a foo* formal were crashing on copy-constructor generation because convert-convert was changing the arg-expression type from foo* (set by the resolver, as expecteed) back to foo[], taken from the variable (switched to foo* taken from convert-src expression).

File:

• src/AST/Expr.cpp (modified) (1 diff)

src/AST/Expr.cpp

@@ -238 +238 @@
 }
 
-ConstantExpr * ConstantExpr::from_string( const CodeLocation & loc, const std::string & s ) {
-        return new ConstantExpr{
-                loc,
-                new ArrayType{
-                        new BasicType{ BasicType::Char, CV::Const },
-                        ConstantExpr::from_int( loc, s.size() + 1 /* null terminator */ ),
-                        FixedLen, DynamicDim },
-                std::string{"\""} + s + "\"",
-                (unsigned long long)0,
-                ConstantExpr::String };
-}
-
 ConstantExpr * ConstantExpr::null( const CodeLocation & loc, const Type * ptrType ) {
         return new ConstantExpr{