me

Author: tbaederr

clang/lib/AST/ByteCode/Compiler.cpp

@@ -489,26 +489,37 @@ bool Compiler<Emitter>::VisitCastExpr(const CastExpr *CE) {
 
   case CK_BooleanToSignedIntegral:
   case CK_IntegralCast: {
-    std::optional<PrimType> FromT = classify(SubExpr->getType());
     std::optional<PrimType> ToT = classify(CE->getType());
-    if (!FromT || !ToT)
+    if (!ToT)
       return false;
 
-    // Try to emit a casted known constant value directly.
-    if (const auto *IL = dyn_cast<IntegerLiteral>(SubExpr)) {
-      if (ToT != PT_IntAP && ToT != PT_IntAPS && FromT != PT_IntAP &&
-          FromT != PT_IntAPS && !CE->getType()->isEnumeralType())
-        return this->emitConst(IL->getValue(), CE);
-      if (!this->emitConst(IL->getValue(), SubExpr))
-        return false;
-    } else {
-      if (!this->visit(SubExpr))
-        return false;
+    bool SourceIsEnum = CE->getType()->isEnumeralType();
+    // Try to emit a casted literal value directly.
+    if (!SourceIsEnum) {
+      if (const auto *IL = dyn_cast<IntegerLiteral>(SubExpr)) {
+        if (ToT == PT_IntAP) {
+          llvm::APInt I = IL->getValue().zextOrTrunc(Ctx.getBitWidth(CE->getType()));
+          return this->emitConstIntAP(I, CE);
+        }
+        if (ToT == PT_IntAPS) {
+          llvm::APInt I = IL->getValue().sextOrTrunc(Ctx.getBitWidth(CE->getType()));
+          return this->emitConstIntAPS(I, CE);
+        }
+        return this->emitConst(IL->getValue(), *ToT, CE);
+
+      }
     }
 
+
+    std::optional<PrimType> FromT = classify(SubExpr->getType());
+    if (!FromT)
+      return false;
+
+    if (!this->visit(SubExpr))
+      return false;
     // Possibly diagnose casts to enum types if the target type does not
     // have a fixed size.
-    if (Ctx.getLangOpts().CPlusPlus && CE->getType()->isEnumeralType()) {
+    if (Ctx.getLangOpts().CPlusPlus && SourceIsEnum) {
       if (const auto *ET = CE->getType().getCanonicalType()->castAs<EnumType>();
           !ET->getDecl()->isFixed()) {
         if (!this->emitCheckEnumValue(*FromT, ET->getDecl(), CE))

clang/lib/AST/ByteCode/Compiler.h

@@ -349,6 +349,10 @@ class Compiler : public ConstStmtVisitor<Compiler<Emitter>, bool>,
   bool emitConst(const llvm::APInt &Value, const Expr *E) {
     return emitConst(static_cast<llvm::APSInt>(Value), E);
   }
+  bool emitConst(const llvm::APInt &Value, PrimType Ty, const Expr *E) {
+    return emitConst(static_cast<llvm::APSInt>(Value), Ty, E);
+  }
+
 
   /// Emits an integer constant.
   template <typename T> bool emitConst(T Value, PrimType Ty, const Expr *E);