From: Nikita Popov Date: Wed, 8 Apr 2020 16:13:24 +0000 (+0200) Subject: [RDA] Try to fix build (NFC) X-Git-Tag: llvmorg-12-init~9648 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5d941ea5849d09c8005c40d13f668b96c508ff2;p=platform%2Fupstream%2Fllvm.git [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. --- diff --git a/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h b/llvm/include/llvm/CodeGen/ReachingDefAnalysis.h index 8def1a6..b81e58f 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; } };