Revert unneeded changes

Author: ahatanak

clang/include/clang/AST/ASTContext.h

@@ -1284,7 +1284,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
   getPointerAuthVTablePointerDiscriminator(const CXXRecordDecl *RD);
 
   /// Return the "other" type-specific discriminator for the given type.
-  uint16_t getPointerAuthTypeDiscriminator(QualType T);
+  uint16_t getPointerAuthTypeDiscriminator(QualType T) const;
 
   /// Apply Objective-C protocol qualifiers to the given type.
   /// \param allowOnPointerType specifies if we can apply protocol

clang/include/clang/AST/Type.h

@@ -2507,7 +2507,6 @@ class alignas(TypeAlignment) Type : public ExtQualsTypeCommonBase {
   bool isFunctionProtoType() const { return getAs<FunctionProtoType>(); }
   bool isPointerType() const;
   bool isSignableType() const;
-  bool isSignablePointerType() const;
   bool isAnyPointerType() const;   // Any C pointer or ObjC object pointer
   bool isCountAttributedType() const;
   bool isBlockPointerType() const;
@@ -8003,9 +8002,7 @@ inline bool Type::isAnyPointerType() const {
   return isPointerType() || isObjCObjectPointerType();
 }
 
-inline bool Type::isSignableType() const { return isSignablePointerType(); }
-
-inline bool Type::isSignablePointerType() const { return isPointerType(); }
+inline bool Type::isSignableType() const { return isPointerType(); }
 
 inline bool Type::isBlockPointerType() const {
   return isa<BlockPointerType>(CanonicalType);

clang/lib/AST/ASTContext.cpp

@@ -3400,7 +3400,7 @@ static void encodeTypeForFunctionPointerAuth(const ASTContext &Ctx,
   }
 }
 
-uint16_t ASTContext::getPointerAuthTypeDiscriminator(QualType T) {
+uint16_t ASTContext::getPointerAuthTypeDiscriminator(QualType T) const {
   assert(!T->isDependentType() &&
          "cannot compute type discriminator of a dependent type");
 
@@ -3410,13 +3410,11 @@ uint16_t ASTContext::getPointerAuthTypeDiscriminator(QualType T) {
   if (T->isFunctionPointerType() || T->isFunctionReferenceType())
     T = T->getPointeeType();
 
-  if (T->isFunctionType()) {
+  if (T->isFunctionType())
     encodeTypeForFunctionPointerAuth(*this, Out, T);
-  } else {
-    T = T.getUnqualifiedType();
-    std::unique_ptr<MangleContext> MC(createMangleContext());
-    MC->mangleCanonicalTypeName(T, Out);
-  }
+  else
+    llvm_unreachable(
+        "type discrimination of non-function type not implemented yet");
 
   return llvm::getPointerAuthStableSipHash(Str);
 }

clang/lib/CodeGen/Address.h

@@ -180,11 +180,6 @@ class Address {
   static Address invalid() { return Address(nullptr); }
   bool isValid() const { return Pointer.getPointer() != nullptr; }
 
-  llvm::Value *getPointerIfNotSigned() const {
-    assert(isValid() && "pointer isn't valid");
-    return !isSigned() ? Pointer.getPointer() : nullptr;
-  }
-
   /// This function is used in situations where the caller is doing some sort of
   /// opaque "laundering" of the pointer.
   void replaceBasePointer(llvm::Value *P) {
@@ -204,11 +199,6 @@ class Address {
     return Pointer.getPointer();
   }
 
-  llvm::Value *getUnsignedPointer() const {
-    assert(!isSigned() && "cannot call this function if pointer is signed");
-    return getBasePointer();
-  }
-
   /// Return the type of the pointer value.
   llvm::PointerType *getType() const {
     return llvm::PointerType::get(
@@ -252,14 +242,6 @@ class Address {
     return *this;
   }
 
-  /// Add a constant offset.
-  void addOffset(CharUnits V, llvm::Type *Ty, CGBuilderTy &Builder);
-
-  /// Add a variable offset.
-  /// \param V An llvm value holding a variable offset.
-  void addOffset(llvm::Value *V, llvm::Type *Ty, CGBuilderTy &Builder,
-                 CharUnits NewAlignment);
-
   bool hasOffset() const { return Offset; }
 
   llvm::Value *getOffset() const { return Offset; }
@@ -270,9 +252,7 @@ class Address {
   /// Return the pointer contained in this class after authenticating it and
   /// adding offset to it if necessary.
   llvm::Value *emitRawPointer(CodeGenFunction &CGF) const {
-    if (!isSigned())
-      return getUnsignedPointer();
-    return emitRawPointerSlow(CGF);
+    return getBasePointer();
   }
 
   /// Return address with different pointer, but same element type and
@@ -303,9 +283,9 @@ class Address {
 };
 
 inline RawAddress::RawAddress(Address Addr)
-    : PointerAndKnownNonNull(
-          Addr.isValid() ? Addr.getUnsignedPointer() : nullptr,
-          Addr.isValid() ? Addr.isKnownNonNull() : NotKnownNonNull),
+    : PointerAndKnownNonNull(Addr.isValid() ? Addr.getBasePointer() : nullptr,
+                             Addr.isValid() ? Addr.isKnownNonNull()
+                                            : NotKnownNonNull),
       ElementType(Addr.isValid() ? Addr.getElementType() : nullptr),
       Alignment(Addr.isValid() ? Addr.getAlignment() : CharUnits::Zero()) {}
 

clang/lib/CodeGen/CGBlocks.cpp

@@ -1974,8 +1974,8 @@ CodeGenFunction::GenerateCopyHelperFunction(const CGBlockInfo &blockInfo) {
         // it. It's not quite worth the annoyance to avoid creating it in the
         // first place.
         if (!needsEHCleanup(captureType.isDestructedType()))
-          if (auto *I = cast_or_null<llvm::Instruction>(
-                  dstField.getPointerIfNotSigned()))
+          if (auto *I =
+                  cast_or_null<llvm::Instruction>(dstField.getBasePointer()))
             I->eraseFromParent();
       }
       break;

clang/lib/CodeGen/CGBuilder.h

@@ -15,7 +15,6 @@
 #include "llvm/Analysis/Utils/Local.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Module.h"
 #include "llvm/IR/Type.h"
 
 namespace clang {
@@ -57,27 +56,7 @@ class CGBuilderTy : public CGBuilderBaseTy {
   CodeGenFunction *getCGF() const { return getInserter().CGF; }
 
   llvm::Value *emitRawPointerFromAddress(Address Addr) const {
-    if (!Addr.isSigned())
-      return Addr.getUnsignedPointer();
-    assert(getCGF() && "CGF not set");
-    return Addr.emitRawPointerSlow(*getCGF());
-  }
-
-  /// Helper function to compute a GEP's offset and add it to Addr.
-  Address addGEPOffset(Address Addr, ArrayRef<llvm::Value *> IdxList,
-                       CharUnits Align, bool IsInBounds, const Twine &Name) {
-    typedef ArrayRef<llvm::Value *>::const_iterator IdxItTy;
-    typedef llvm::generic_gep_type_iterator<IdxItTy> GEPTypeIt;
-    const llvm::DataLayout &DL = BB->getParent()->getParent()->getDataLayout();
-    GEPTypeIt GTI = GEPTypeIt::begin(Addr.getElementType(), IdxList.begin());
-    IdxItTy IdxBegin = IdxList.begin(), IdxEnd = IdxList.end();
-    llvm::Type *GEPType = Addr.getType();
-    SmallString<12> Buffer;
-    StringRef GEPName = Name.toStringRef(Buffer);
-    std::pair<llvm::Value *, llvm::Type *> OffsetAndType = llvm::EmitGEPOffset(
-        this, DL, GTI, IdxBegin, IdxEnd, GEPType, GEPName, IsInBounds, false);
-    Addr.addOffset(OffsetAndType.first, OffsetAndType.second, *this, Align);
-    return Addr;
+    return Addr.getBasePointer();
   }
 
   template <bool IsInBounds>
@@ -243,14 +222,11 @@ class CGBuilderTy : public CGBuilderBaseTy {
     const llvm::StructLayout *Layout = DL.getStructLayout(ElTy);
     auto Offset = CharUnits::fromQuantity(Layout->getElementOffset(Index));
 
-    if (!Addr.isSigned())
-      return Address(CreateStructGEP(Addr.getElementType(),
-                                     Addr.getUnsignedPointer(), Index, Name),
-                     ElTy->getElementType(Index),
-                     Addr.getAlignment().alignmentAtOffset(Offset),
-                     Addr.isKnownNonNull());
-    Addr.addOffset(Offset, ElTy->getTypeAtIndex(Index), *this);
-    return Addr;
+    return Address(CreateStructGEP(Addr.getElementType(), Addr.getBasePointer(),
+                                   Index, Name),
+                   ElTy->getElementType(Index),
+                   Addr.getAlignment().alignmentAtOffset(Offset),
+                   Addr.isKnownNonNull());
   }
 
   /// Given
@@ -268,15 +244,12 @@ class CGBuilderTy : public CGBuilderBaseTy {
     CharUnits EltSize =
         CharUnits::fromQuantity(DL.getTypeAllocSize(ElTy->getElementType()));
 
-    if (!Addr.isSigned())
-      return Address(
-          CreateInBoundsGEP(Addr.getElementType(), Addr.getUnsignedPointer(),
-                            {getSize(CharUnits::Zero()), getSize(Index)}, Name),
-          ElTy->getElementType(),
-          Addr.getAlignment().alignmentAtOffset(Index * EltSize),
-          Addr.isKnownNonNull());
-    Addr.addOffset(Index * EltSize, ElTy, *this);
-    return Addr;
+    return Address(
+        CreateInBoundsGEP(Addr.getElementType(), Addr.getBasePointer(),
+                          {getSize(CharUnits::Zero()), getSize(Index)}, Name),
+        ElTy->getElementType(),
+        Addr.getAlignment().alignmentAtOffset(Index * EltSize),
+        Addr.isKnownNonNull());
   }
 
   /// Given
@@ -290,14 +263,10 @@ class CGBuilderTy : public CGBuilderBaseTy {
     const llvm::DataLayout &DL = BB->getDataLayout();
     CharUnits EltSize = CharUnits::fromQuantity(DL.getTypeAllocSize(ElTy));
 
-    if (!Addr.isSigned())
-      return Address(CreateInBoundsGEP(ElTy, Addr.getUnsignedPointer(),
-                                       getSize(Index), Name),
-                     ElTy,
-                     Addr.getAlignment().alignmentAtOffset(Index * EltSize),
-                     Addr.isKnownNonNull());
-    Addr.addOffset(Index * EltSize, ElTy, *this);
-    return Addr;
+    return Address(
+        CreateInBoundsGEP(ElTy, Addr.getBasePointer(), getSize(Index), Name),
+        ElTy, Addr.getAlignment().alignmentAtOffset(Index * EltSize),
+        Addr.isKnownNonNull());
   }
 
   /// Given
@@ -311,12 +280,9 @@ class CGBuilderTy : public CGBuilderBaseTy {
     const llvm::DataLayout &DL = BB->getDataLayout();
     CharUnits EltSize = CharUnits::fromQuantity(DL.getTypeAllocSize(ElTy));
 
-    if (!Addr.isSigned())
-      return Address(
-          CreateGEP(ElTy, Addr.getUnsignedPointer(), getSize(Index), Name),
-          ElTy, Addr.getAlignment().alignmentAtOffset(Index * EltSize));
-    Addr.addOffset(Index * EltSize, ElTy, *this);
-    return Addr;
+    return Address(CreateGEP(ElTy, Addr.getBasePointer(), getSize(Index), Name),
+                   Addr.getElementType(),
+                   Addr.getAlignment().alignmentAtOffset(Index * EltSize));
   }
 
   /// Create GEP with single dynamic index. The address alignment is reduced
@@ -338,28 +304,20 @@ class CGBuilderTy : public CGBuilderBaseTy {
   Address CreateConstInBoundsByteGEP(Address Addr, CharUnits Offset,
                                      const llvm::Twine &Name = "") {
     assert(Addr.getElementType() == TypeCache.Int8Ty);
-
-    if (!Addr.isSigned())
-      return Address(
-          CreateInBoundsGEP(Addr.getElementType(), Addr.getUnsignedPointer(),
-                            getSize(Offset), Name),
-          Addr.getElementType(), Addr.getAlignment().alignmentAtOffset(Offset),
-          Addr.isKnownNonNull());
-    Addr.addOffset(Offset, TypeCache.Int8Ty, *this);
-    return Addr;
+    return Address(
+        CreateInBoundsGEP(Addr.getElementType(), Addr.getBasePointer(),
+                          getSize(Offset), Name),
+        Addr.getElementType(), Addr.getAlignment().alignmentAtOffset(Offset),
+        Addr.isKnownNonNull());
   }
 
   Address CreateConstByteGEP(Address Addr, CharUnits Offset,
                              const llvm::Twine &Name = "") {
     assert(Addr.getElementType() == TypeCache.Int8Ty);
-
-    if (!Addr.isSigned())
-      return Address(CreateGEP(Addr.getElementType(), Addr.getUnsignedPointer(),
-                               getSize(Offset), Name),
-                     Addr.getElementType(),
-                     Addr.getAlignment().alignmentAtOffset(Offset));
-    Addr.addOffset(Offset, TypeCache.Int8Ty, *this);
-    return Addr;
+    return Address(CreateGEP(Addr.getElementType(), Addr.getBasePointer(),
+                             getSize(Offset), Name),
+                   Addr.getElementType(),
+                   Addr.getAlignment().alignmentAtOffset(Offset));
   }
 
   using CGBuilderBaseTy::CreateConstInBoundsGEP2_32;
@@ -386,12 +344,10 @@ class CGBuilderTy : public CGBuilderBaseTy {
   Address CreateInBoundsGEP(Address Addr, ArrayRef<llvm::Value *> IdxList,
                             llvm::Type *ElementType, CharUnits Align,
                             const Twine &Name = "") {
-    if (!Addr.isSigned())
-      return RawAddress(CreateInBoundsGEP(Addr.getElementType(),
-                                          emitRawPointerFromAddress(Addr),
-                                          IdxList, Name),
-                        ElementType, Align, Addr.isKnownNonNull());
-    return addGEPOffset(Addr, IdxList, Align, true, Name);
+    return RawAddress(CreateInBoundsGEP(Addr.getElementType(),
+                                        emitRawPointerFromAddress(Addr),
+                                        IdxList, Name),
+                      ElementType, Align, Addr.isKnownNonNull());
   }
 
   using CGBuilderBaseTy::CreateIsNull;

clang/lib/CodeGen/CGBuiltin.cpp

@@ -2151,8 +2151,7 @@ RValue CodeGenFunction::emitBuiltinOSLogFormat(const CallExpr &E) {
 
   // Ignore argument 1, the format string. It is not currently used.
   CallArgList Args;
-  Args.add(RValue::get(getAsNaturalPointerTo(BufAddr, Ctx.VoidTy)),
-           Ctx.VoidPtrTy);
+  Args.add(RValue::get(BufAddr.emitRawPointer(*this)), Ctx.VoidPtrTy);
 
   for (const auto &Item : Layout.Items) {
     int Size = Item.getSizeByte();

clang/lib/CodeGen/CGCall.cpp

@@ -3508,8 +3508,7 @@ static llvm::Value *tryRemoveRetainOfSelf(CodeGenFunction &CGF,
   llvm::LoadInst *load =
     dyn_cast<llvm::LoadInst>(retainedValue->stripPointerCasts());
   if (!load || load->isAtomic() || load->isVolatile() ||
-      load->getPointerOperand() !=
-          CGF.GetAddrOfLocalVar(self).getPointerIfNotSigned())
+      load->getPointerOperand() != CGF.GetAddrOfLocalVar(self).getBasePointer())
     return nullptr;
 
   // Okay!  Burn it all down.  This relies for correctness on the
@@ -3546,8 +3545,7 @@ static llvm::Value *emitAutoreleaseOfResult(CodeGenFunction &CGF,
 
 /// Heuristically search for a dominating store to the return-value slot.
 static llvm::StoreInst *findDominatingStoreToReturnValue(CodeGenFunction &CGF) {
-  // This function shouldn't be called when ReturnValue is signed.
-  llvm::Value *ReturnValuePtr = CGF.ReturnValue.getUnsignedPointer();
+  llvm::Value *ReturnValuePtr = CGF.ReturnValue.getBasePointer();
 
   // Check if a User is a store which pointerOperand is the ReturnValue.
   // We are looking for stores to the ReturnValue, not for stores of the
@@ -4135,16 +4133,15 @@ static bool isProvablyNull(llvm::Value *addr) {
 }
 
 static bool isProvablyNonNull(Address Addr, CodeGenFunction &CGF) {
-  return !Addr.isSigned() && llvm::isKnownNonZero(Addr.getUnsignedPointer(),
-                                                  CGF.CGM.getDataLayout());
+  return llvm::isKnownNonZero(Addr.getBasePointer(), CGF.CGM.getDataLayout());
 }
 
 /// Emit the actual writing-back of a writeback.
 static void emitWriteback(CodeGenFunction &CGF,
                           const CallArgList::Writeback &writeback) {
   const LValue &srcLV = writeback.Source;
   Address srcAddr = srcLV.getAddress();
-  assert(!isProvablyNull(srcAddr.getPointerIfNotSigned()) &&
+  assert(!isProvablyNull(srcAddr.getBasePointer()) &&
          "shouldn't have writeback for provably null argument");
 
   llvm::BasicBlock *contBB = nullptr;
@@ -4261,7 +4258,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
       CGF.ConvertTypeForMem(CRE->getType()->getPointeeType());
 
   // If the address is a constant null, just pass the appropriate null.
-  if (isProvablyNull(srcAddr.getPointerIfNotSigned())) {
+  if (isProvablyNull(srcAddr.getBasePointer())) {
     args.add(RValue::get(llvm::ConstantPointerNull::get(destType)),
              CRE->getType());
     return;
@@ -5101,7 +5098,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   llvm::Value *UnusedReturnSizePtr = nullptr;
   if (RetAI.isIndirect() || RetAI.isInAlloca() || RetAI.isCoerceAndExpand()) {
     if (!ReturnValue.isNull()) {
-      SRetPtr = ReturnValue.getValue();
+      SRetPtr = ReturnValue.getAddress();
     } else {
       SRetPtr = CreateMemTemp(RetTy, "tmp", &SRetAlloca);
       if (HaveInsertPoint() && ReturnValue.isUnused()) {

clang/lib/CodeGen/CGException.cpp

@@ -1835,8 +1835,8 @@ Address CodeGenFunction::recoverAddrOfEscapedLocal(CodeGenFunction &ParentCGF,
                                                    llvm::Value *ParentFP) {
   llvm::CallInst *RecoverCall = nullptr;
   CGBuilderTy Builder(*this, AllocaInsertPt);
-  if (auto *ParentAlloca = dyn_cast_or_null<llvm::AllocaInst>(
-          ParentVar.getPointerIfNotSigned())) {
+  if (auto *ParentAlloca =
+          dyn_cast_or_null<llvm::AllocaInst>(ParentVar.getBasePointer())) {
     // Mark the variable escaped if nobody else referenced it and compute the
     // localescape index.
     auto InsertPair = ParentCGF.EscapedLocals.insert(