change Decl::DeclCtx to use a PointerIntPair instead of hand bitmangling.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67858 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index cb12618..47059d9 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -121,7 +121,8 @@
if (isOutOfSemaDC())
delete getMultipleDC();
- DeclCtx = reinterpret_cast<uintptr_t>(DC);
+ DeclCtx.setPointer(DC);
+ DeclCtx.setInt(false);
}
void Decl::setLexicalDeclContext(DeclContext *DC) {
@@ -132,7 +133,8 @@
MultipleDC *MDC = new MultipleDC();
MDC->SemanticDC = getDeclContext();
MDC->LexicalDC = DC;
- DeclCtx = reinterpret_cast<uintptr_t>(MDC) | 0x1;
+ DeclCtx.setPointer(MDC);
+ DeclCtx.setInt(true);
} else {
getMultipleDC()->LexicalDC = DC;
}