fixup!

Created using spr 1.3.8-beta.1

Author: melver

clang/lib/CodeGen/CGExpr.cpp

@@ -1284,12 +1284,10 @@ typeContainsPointer(QualType T,
   for (QualType CurrentT = T; const auto *TT = CurrentT->getAs<TypedefType>();
        CurrentT = TT->getDecl()->getUnderlyingType()) {
     const IdentifierInfo *II = TT->getDecl()->getIdentifier();
-    if (!II)
-      continue;
     // Special Case: Syntactically uintptr_t is not a pointer; semantically,
     // however, very likely used as such. Therefore, classify uintptr_t as a
     // pointer, too.
-    if (II->isStr("uintptr_t"))
+    if (II && II->isStr("uintptr_t"))
       return true;
   }
 

llvm/lib/Transforms/Instrumentation/AllocToken.cpp

@@ -158,7 +158,9 @@ bool containsPointer(const MDNode *MD) {
 class ModeBase {
 public:
   explicit ModeBase(const IntegerType &TokenTy, uint64_t MaxTokens)
-      : MaxTokens(MaxTokens ? MaxTokens : TokenTy.getBitMask()) {}
+      : MaxTokens(MaxTokens ? MaxTokens : TokenTy.getBitMask()) {
+    assert(MaxTokens <= TokenTy.getBitMask());
+  }
 
 protected:
   uint64_t boundedToken(uint64_t Val) const {