diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-05-27 20:44:45 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-05-27 20:44:45 +0000 |
| commit | 33956c43007dfb106f401e3c14abc011a4b1d4ca (patch) | |
| tree | 50a603f7e1932cd42f58e26687ce907933014db0 /contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp | |
| parent | ff0cc061ecf297f1556e906d229826fd709f37d6 (diff) | |
| parent | 5e20cdd81c44a443562a09007668ffdf76c455af (diff) | |
Merge clang trunk r238337 from ^/vendor/clang/dist, resolve conflicts,
and preserve our customizations, where necessary.
Notes
Notes:
svn path=/projects/clang-trunk/; revision=283633
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp b/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp index 63ef3b2355fb..f80eadf18d56 100644 --- a/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp +++ b/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp @@ -33,6 +33,8 @@ void FunctionScopeInfo::Clear() { ObjCWarnForNoDesignatedInitChain = false; ObjCIsSecondaryInit = false; ObjCWarnForNoInitDelegation = false; + FirstCXXTryLoc = SourceLocation(); + FirstSEHTryLoc = SourceLocation(); SwitchStack.clear(); Returns.clear(); |