diff options
| -rw-r--r-- | lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp index 8cee61185bc..55772e0898e 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp @@ -156,9 +156,12 @@ clang::NamedDecl *IRForTarget::DeclForGlobal(GlobalValue *global_val) { } /// Returns true iff the mangled symbol is for a static guard variable. -static bool isGuardVariableSymbol(llvm::StringRef mangled_symbol) { - return mangled_symbol.startswith("_ZGV") || // Itanium ABI - mangled_symbol.endswith("@4IA"); // Microsoft ABI +static bool isGuardVariableSymbol(llvm::StringRef mangled_symbol, + bool check_ms_abi = true) { + bool result = mangled_symbol.startswith("_ZGV"); // Itanium ABI guard variable + if (check_ms_abi) + result |= mangled_symbol.endswith("@4IA"); // Microsoft ABI + return result; } bool IRForTarget::CreateResultVariable(llvm::Function &llvm_function) { @@ -178,8 +181,9 @@ bool IRForTarget::CreateResultVariable(llvm::Function &llvm_function) { for (StringMapEntry<llvm::Value *> &value_symbol : value_symbol_table) { result_name = value_symbol.first(); - // Check if this is a guard variable. - const bool is_guard_var = isGuardVariableSymbol(result_name); + // Check if this is a guard variable. It seems this causes some hiccups + // on Windows, so let's only check for Itanium guard variables. + bool is_guard_var = isGuardVariableSymbol(result_name, /*MS ABI*/ false); if (result_name.contains("$__lldb_expr_result_ptr") && !is_guard_var) { found_result = true; |
