diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-12-14 21:38:18 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-12-14 21:38:18 +0000 |
| commit | 7849eeb0359e086870633437529c7f8a6a30a952 (patch) | |
| tree | f6e8d655f9a1feba6677efeb815d749321625ee1 /clang/lib/CodeGen/CGDecl.cpp | |
| parent | 65aedad62862a356c49fc5457277fb0c9cd3a75a (diff) | |
| download | bcm5719-llvm-7849eeb0359e086870633437529c7f8a6a30a952.tar.gz bcm5719-llvm-7849eeb0359e086870633437529c7f8a6a30a952.zip | |
Revert 289252 (and follow-up 289285), it caused PR31374
llvm-svn: 289713
Diffstat (limited to 'clang/lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index 46573477580..695e92ea1d0 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/lib/CodeGen/CGDecl.cpp @@ -708,7 +708,7 @@ void CodeGenFunction::EmitScalarInit(const Expr *init, const ValueDecl *D, } auto ty = cast<llvm::PointerType>(tempLV.getAddress().getElementType()); - llvm::Value *zero = CGM.getNullPointer(ty, tempLV.getType()); + llvm::Value *zero = llvm::ConstantPointerNull::get(ty); // If __weak, we want to use a barrier under certain conditions. if (lifetime == Qualifiers::OCL_Weak) |
