diff options
| author | Adrian Prantl <aprantl@apple.com> | 2017-08-24 18:18:24 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2017-08-24 18:18:24 +0000 |
| commit | 1b6d8713e4ec71e7aefec11e17a8bc3ff5c72d66 (patch) | |
| tree | fba3803e954778141d1253b9a6dee93e5f7736ac /clang/lib/CodeGen/CodeGenFunction.cpp | |
| parent | 44ea3195968e552a2b4cb1020f6933271e7a4a36 (diff) | |
| download | bcm5719-llvm-1b6d8713e4ec71e7aefec11e17a8bc3ff5c72d66.tar.gz bcm5719-llvm-1b6d8713e4ec71e7aefec11e17a8bc3ff5c72d66.zip | |
Revert "[ubsan] PR34266: When sanitizing the 'this' value for a member function that happens to be a lambda call operator, use the lambda's 'this' pointer, not the captured enclosing 'this' pointer (if any)."
This reverts commit r311589 because of bot breakage.
http://green.lab.llvm.org/green/job/clang-stage2-cmake-RgSan_check/4115/consoleFull#15752874848254eaf0-7326-4999-85b0-388101f2d404.
llvm-svn: 311680
Diffstat (limited to 'clang/lib/CodeGen/CodeGenFunction.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 0df7d271070..4201804e185 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -1014,11 +1014,11 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, } // Check the 'this' pointer once per function, if it's available. - if (CXXABIThisValue) { + if (CXXThisValue) { SanitizerSet SkippedChecks; SkippedChecks.set(SanitizerKind::ObjectSize, true); QualType ThisTy = MD->getThisType(getContext()); - EmitTypeCheck(TCK_Load, Loc, CXXABIThisValue, ThisTy, + EmitTypeCheck(TCK_Load, Loc, CXXThisValue, ThisTy, getContext().getTypeAlignInChars(ThisTy->getPointeeType()), SkippedChecks); } |
