Merge pull request #1497 from adrian-prantl/pointersize-next

Implement TypeSystemSwiftTypeRef::GetPointerByteSize() (NFC)  …

Author: adrian-prantl

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -1118,6 +1118,16 @@ template <> bool Equivalent<ConstString>(ConstString l, ConstString r) {
 
 // This can be removed once the transition is complete.
 #ifndef NDEBUG
+#define VALIDATE_AND_RETURN_STATIC(IMPL, REFERENCE)                     \
+  do {                                                                         \
+    auto result = IMPL();                                                      \
+    if (!m_swift_ast_context)                                                  \
+      return result;                                                           \
+    assert((result == m_swift_ast_context->REFERENCE()) &&                     \
+           "TypeSystemSwiftTypeRef diverges from SwiftASTContext");            \
+    return result;                                                             \
+  } while (0)
+
 #define VALIDATE_AND_RETURN(IMPL, REFERENCE, TYPE, ARGS)                       \
   do {                                                                         \
     auto result = IMPL();                                                      \
@@ -1133,11 +1143,8 @@ template <> bool Equivalent<ConstString>(ConstString l, ConstString r) {
     return result;                                                             \
   } while (0)
 #else
-#define VALIDATE_AND_RETURN(IMPL, REFERENCE, TYPE, ARGS)                       \
-  do {                                                                         \
-    auto result = IMPL();                                                      \
-    return result;                                                             \
-  } while (0)
+#define VALIDATE_AND_RETURN_STATIC(IMPL, REFERENCE) return IMPL()
+#define VALIDATE_AND_RETURN(IMPL, REFERENCE, TYPE, ARGS) return IMPL()
 #endif
 
 CompilerType
@@ -1385,7 +1392,21 @@ bool TypeSystemSwiftTypeRef::IsVoidType(opaque_compiler_type_t type) {
 }
 // AST related queries
 uint32_t TypeSystemSwiftTypeRef::GetPointerByteSize() {
-  return m_swift_ast_context->GetPointerByteSize();
+  auto impl = [&]() -> uint32_t {
+    if (auto *module = GetModule()) {
+      auto &triple = module->GetArchitecture().GetTriple();
+      if (triple.isArch64Bit())
+        return 8;
+      if (triple.isArch32Bit())
+        return 4;
+      if (triple.isArch16Bit())
+        return 2;
+    }
+    // An expression context has no module. Since it's for expression
+    // evaluation we might as well defer to the SwiftASTContext.
+    return m_swift_ast_context->GetPointerByteSize();
+  };
+  VALIDATE_AND_RETURN_STATIC(impl, GetPointerByteSize);
 }
 // Accessors
 ConstString TypeSystemSwiftTypeRef::GetTypeName(opaque_compiler_type_t type) {