implement ASTReader and ASTWriter methods, use auto, rename OBKind enum field

Signed-off-by: Justin Stitt <[email protected]>

Author: JustinStitt

clang/include/clang/AST/TypeBase.h

@@ -9057,8 +9057,7 @@ inline bool Type::isIntegralOrEnumerationType() const {
   if (const auto *ET = dyn_cast<EnumType>(CanonicalType))
     return IsEnumDeclComplete(ET->getOriginalDecl());
 
-  if (const OverflowBehaviorType *OBT =
-          dyn_cast<OverflowBehaviorType>(CanonicalType))
+  if (const auto *OBT = dyn_cast<OverflowBehaviorType>(CanonicalType))
     return OBT->getUnderlyingType()->isIntegralOrEnumerationType();
 
   return isBitIntType();

clang/include/clang/Basic/LangOptions.h

@@ -128,7 +128,7 @@ class LangOptionsBase {
     // by sanitizers (PR82432). This field is needed to disambiguate canonical
     // wrapping type behaviors from -fwrapv behaviors.
     // -fwrapv
-    OB_FWrapv
+    OB_SignedAndDefined
   };
 
   // FIXME: Unify with TUKind.

clang/lib/AST/Type.cpp

@@ -2137,9 +2137,8 @@ bool Type::isIntegralOrUnscopedEnumerationType() const {
   if (const auto *BT = dyn_cast<BuiltinType>(CanonicalType))
     return BT->isInteger();
 
-  if (const OverflowBehaviorType *OBT =
-          dyn_cast<OverflowBehaviorType>(CanonicalType))
-    return OBT->getUnderlyingType()->isIntegralOrUnscopedEnumerationType();
+  if (const auto *OBT = dyn_cast<OverflowBehaviorType>(CanonicalType))
+    return OBT->getUnderlyingType()->isIntegerType();
 
   if (isBitIntType())
     return true;

clang/lib/CodeGen/CGExprScalar.cpp

@@ -217,7 +217,7 @@ getOverflowBehaviorConsideringType(const CodeGenFunction &CGF,
 
   switch (CGF.getLangOpts().getSignedOverflowBehavior()) {
   case LangOptions::SignedOverflowBehaviorTy::SOB_Defined:
-    return LangOptions::OverflowBehaviorKind::OB_FWrapv;
+    return LangOptions::OverflowBehaviorKind::OB_SignedAndDefined;
   case LangOptions::SignedOverflowBehaviorTy::SOB_Undefined:
     return LangOptions::OverflowBehaviorKind::OB_Unset;
   case LangOptions::SignedOverflowBehaviorTy::SOB_Trapping:
@@ -820,7 +820,7 @@ class ScalarExprEmitter
       switch (getOverflowBehaviorConsideringType(CGF, Ops.Ty)) {
       case LangOptions::OB_Wrap:
         return Builder.CreateMul(Ops.LHS, Ops.RHS, "mul");
-      case LangOptions::OB_FWrapv:
+      case LangOptions::OB_SignedAndDefined:
         if (!hasSan)
           return Builder.CreateMul(Ops.LHS, Ops.RHS, "mul");
         [[fallthrough]];
@@ -3058,7 +3058,7 @@ llvm::Value *ScalarExprEmitter::EmitIncDecConsiderOverflowBehavior(
   switch (getOverflowBehaviorConsideringType(CGF, Ty)) {
   case LangOptions::OB_Wrap:
     return Builder.CreateAdd(InVal, Amount, Name);
-  case LangOptions::OB_FWrapv:
+  case LangOptions::OB_SignedAndDefined:
     if (!hasSan)
       return Builder.CreateAdd(InVal, Amount, Name);
     [[fallthrough]];
@@ -4533,7 +4533,7 @@ Value *ScalarExprEmitter::EmitAdd(const BinOpInfo &op) {
     switch (getOverflowBehaviorConsideringType(CGF, op.Ty)) {
     case LangOptions::OB_Wrap:
       return Builder.CreateAdd(op.LHS, op.RHS, "add");
-    case LangOptions::OB_FWrapv:
+    case LangOptions::OB_SignedAndDefined:
       if (!hasSan)
         return Builder.CreateAdd(op.LHS, op.RHS, "add");
       [[fallthrough]];
@@ -4693,7 +4693,7 @@ Value *ScalarExprEmitter::EmitSub(const BinOpInfo &op) {
       switch (getOverflowBehaviorConsideringType(CGF, op.Ty)) {
       case LangOptions::OB_Wrap:
         return Builder.CreateSub(op.LHS, op.RHS, "sub");
-      case LangOptions::OB_FWrapv:
+      case LangOptions::OB_SignedAndDefined:
         if (!hasSan)
           return Builder.CreateSub(op.LHS, op.RHS, "sub");
         [[fallthrough]];

clang/lib/Sema/SemaExpr.cpp

@@ -1416,8 +1416,8 @@ static QualType handleOverflowBehaviorTypeConversion(Sema &S, ExprResult &LHS,
   QualType LHSType = LHS.get()->getType().getUnqualifiedType();
   QualType RHSType = RHS.get()->getType().getUnqualifiedType();
 
-  const OverflowBehaviorType *LhsOBT = LHSType->getAs<OverflowBehaviorType>();
-  const OverflowBehaviorType *RhsOBT = RHSType->getAs<OverflowBehaviorType>();
+  const auto *LhsOBT = LHSType->getAs<OverflowBehaviorType>();
+  const auto *RhsOBT = RHSType->getAs<OverflowBehaviorType>();
 
   assert(LHSType->isIntegerType() && RHSType->isIntegerType() &&
          "Non-integer type conversion not supported for OverflowBehaviorTypes");
@@ -1697,9 +1697,8 @@ QualType Sema::UsualArithmeticConversions(ExprResult &LHS, ExprResult &RHS,
     LHSType = AtomicLHS->getValueType();
 
   // If both types are identical, no conversion is needed.
-  if (Context.hasSameType(LHSType, RHSType)) {
+  if (Context.hasSameType(LHSType, RHSType))
     return Context.getCommonSugaredType(LHSType, RHSType);
-  }
 
   // If either side is a non-arithmetic type (e.g. a pointer), we are done.
   // The caller can deal with this (e.g. pointer + int).

clang/lib/Serialization/ASTReader.cpp

@@ -7478,7 +7478,7 @@ void TypeLocReader::VisitBTFTagAttributedTypeLoc(BTFTagAttributedTypeLoc TL) {
 }
 
 void TypeLocReader::VisitOverflowBehaviorTypeLoc(OverflowBehaviorTypeLoc TL) {
-  // Nothing to do.
+  TL.setAttrLoc(readSourceLocation());
 }
 
 void TypeLocReader::VisitHLSLAttributedResourceTypeLoc(

clang/lib/Serialization/ASTWriter.cpp

@@ -605,7 +605,7 @@ void TypeLocWriter::VisitBTFTagAttributedTypeLoc(BTFTagAttributedTypeLoc TL) {
 }
 
 void TypeLocWriter::VisitOverflowBehaviorTypeLoc(OverflowBehaviorTypeLoc TL) {
-  // Nothing to do.
+  addSourceLocation(TL.getAttrLoc());
 }
 
 void TypeLocWriter::VisitHLSLAttributedResourceTypeLoc(

clang/test/AST/ast-print-overflow-behavior.cpp

@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 -foverflow-behavior-types -std=c++11 -ast-print %s -o - | FileCheck %s
+
+extern int __attribute__((overflow_behavior(no_wrap))) a;
+extern int __attribute__((overflow_behavior(wrap))) b;
+
+// CHECK: extern __no_wrap int a;
+// CHECK: extern __wrap int b;