diff options
| author | James Y Knight <jyknight@google.com> | 2019-01-31 21:51:58 +0000 |
|---|---|---|
| committer | James Y Knight <jyknight@google.com> | 2019-01-31 21:51:58 +0000 |
| commit | fadf25068e32b44b010e6e03c6ab93bec41eae82 (patch) | |
| tree | 9b22878f495e0b75d9e86cd01bcf199308dc9234 /clang | |
| parent | c62214da3de04f702e29e4ba4772c9463e2829ca (diff) | |
| download | bcm5719-llvm-fadf25068e32b44b010e6e03c6ab93bec41eae82.tar.gz bcm5719-llvm-fadf25068e32b44b010e6e03c6ab93bec41eae82.zip | |
Revert "[opaque pointer types] Add a FunctionCallee wrapper type, and use it."
This reverts commit f47d6b38c7a61d50db4566b02719de05492dcef1 (r352791).
Seems to run into compilation failures with GCC (but not clang, where
I tested it). Reverting while I investigate.
llvm-svn: 352800
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/CodeGen/CGExpr.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 690773bb576..4bd454411a2 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -3056,7 +3056,7 @@ void CodeGenFunction::EmitCfiSlowPathCheck( bool WithDiag = !CGM.getCodeGenOpts().SanitizeTrap.has(Kind); llvm::CallInst *CheckCall; - llvm::FunctionCallee SlowPathFn; + llvm::Constant *SlowPathFn; if (WithDiag) { llvm::Constant *Info = llvm::ConstantStruct::getAnon(StaticArgs); auto *InfoPtr = @@ -3078,8 +3078,7 @@ void CodeGenFunction::EmitCfiSlowPathCheck( CheckCall = Builder.CreateCall(SlowPathFn, {TypeId, Ptr}); } - CGM.setDSOLocal( - cast<llvm::GlobalValue>(SlowPathFn.getCallee()->stripPointerCasts())); + CGM.setDSOLocal(cast<llvm::GlobalValue>(SlowPathFn->stripPointerCasts())); CheckCall->setDoesNotThrow(); EmitBlock(Cont); |
