[llvm] b5d941e - [RDA] Try to fix build (NFC)

[Nikita Popov via llvm-commits]

Author: Nikita Popov
Date: 2020-04-08T18:15:01+02:00
New Revision: b5d941ea5849d09c8005c40d13f668b96c508ff2

URL: https://github.com/llvm/llvm-project/commit/b5d941ea5849d09c8005c40d13f668b96c508ff2
DIFF: https://github.com/llvm/llvm-project/commit/b5d941ea5849d09c8005c40d13f668b96c508ff2.diff

LOG: [RDA] Try to fix build (NFC)

fuchsia-x86_64-linux builder fails with:

/b/fuchsia-x86_64-linux/llvm.src/llvm/include/llvm/ADT/TinyPtrVector.h:85:15:
error: no matching conversion for C-style cast from 'nullptr_t' to 'llvm::ReachingDef'
    RHS.Val = (EltTy)nullptr;

Let's see whether adding an explicit nullptr_t constructor helps.

Added: 
    

Modified: 
    llvm/include/llvm/CodeGen/ReachingDefAnalysis.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h b/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
index 8def1a6d39fc..b81e58f97f69 100644
--- a/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
+++ b/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h
@@ -43,6 +43,7 @@ class ReachingDef {
   explicit ReachingDef(uintptr_t Encoded) : Encoded(Encoded) {}
 
 public:
+  ReachingDef(nullptr_t) : Encoded(0) {}
   ReachingDef(int Instr) : Encoded((Instr << 2) | 2) {}
   operator int() const { return ((int) Encoded) >> 2; }
 };