aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/CodeGen/CodeGenFunction.h
diff options
context:
space:
mode:
authorZequan Wu <zequanwu@google.com>2020-05-21 16:12:03 -0700
committerZequan Wu <zequanwu@google.com>2020-05-21 16:13:18 -0700
commitb0a0f01bc175b4c444052f871a89421889f8b5ce (patch)
treea4e64309abfc46d4abbd11f2b32311aea7408520 /clang/lib/CodeGen/CodeGenFunction.h
parent77ffce6954470018de1748d33f9ac6aa66121e9f (diff)
downloadllvm-b0a0f01bc175b4c444052f871a89421889f8b5ce.zip
llvm-b0a0f01bc175b4c444052f871a89421889f8b5ce.tar.gz
llvm-b0a0f01bc175b4c444052f871a89421889f8b5ce.tar.bz2
Revert "Add nomerge function attribute to clang"
This reverts commit 307e85395485e1eff9533b2d7952b16f33ceae38.
Diffstat (limited to 'clang/lib/CodeGen/CodeGenFunction.h')
-rw-r--r--clang/lib/CodeGen/CodeGenFunction.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
index 2b5871d..731317a 100644
--- a/clang/lib/CodeGen/CodeGenFunction.h
+++ b/clang/lib/CodeGen/CodeGenFunction.h
@@ -595,9 +595,6 @@ public:
/// region.
bool IsInPreservedAIRegion = false;
- /// True if the current statement has nomerge attribute.
- bool InNoMergeAttributedStmt = false;
-
const CodeGen::CGBlockInfo *BlockInfo = nullptr;
llvm::Value *BlockPointer = nullptr;