[Lldb-commits] [lldb] r114928 - in /lldb/trunk: include/lldb/Expression/ClangExpressionDeclMap.h source/Expression/ClangExpressionDeclMap.cpp
Sean Callanan
scallanan at apple.com
Mon Sep 27 16:54:58 PDT 2010
Author: spyffe
Date: Mon Sep 27 18:54:58 2010
New Revision: 114928
URL: http://llvm.org/viewvc/llvm-project?rev=114928&view=rev
Log:
Added type lookup, so variables with user-defined types
can be allocated and manipulated.
Modified:
lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
Modified: lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h?rev=114928&r1=114927&r2=114928&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionDeclMap.h Mon Sep 27 18:54:58 2010
@@ -19,6 +19,7 @@
// Other libraries and framework includes
// Project includes
+#include "llvm/ADT/DenseMap.h"
#include "lldb/Core/ClangForward.h"
#include "lldb/Core/Value.h"
#include "lldb/Expression/ClangExpressionVariable.h"
@@ -363,6 +364,16 @@
std::string m_result_name; ///< The name of the result variable ($1, for example)
TypeFromUser m_object_pointer_type; ///< The type of the "this" variable, if one exists.
+ llvm::DenseMap <const char*, bool> m_lookedup_types; ///< Contains each type that has been looked up in the current type lookup stack.
+ ///< m_lookedup_types is used to gate the type search in GetDecls(). If a name is
+ ///< not in it, the following procedure occurs:
+ ///< 1 The name is added to m_lookedup_types.
+ ///< 2 The type is looked up and added, potentially causing more type loookups.
+ ///< 3 The name is removed from m_lookedup_types.
+ ///< There must be no non-fatal error path that permits the type search to complete
+ ///< without removing the name from m_lookedup_types at the end.
+ ///< m_lookedup_type assumes single threadedness.
+
//------------------------------------------------------------------
/// Given a stack frame, find a variable that matches the given name and
/// type. We need this for expression re-use; we may not always get the
@@ -383,12 +394,6 @@
/// @return
/// The LLDB Variable found, or NULL if none was found.
//------------------------------------------------------------------
-#ifdef OLD_CODE
- Variable *FindVariableInScope(const SymbolContext &sym_ctx,
- const char *name,
- TypeFromUser *type = NULL);
-#endif
-
Variable *FindVariableInScope(StackFrame &frame,
const char *name,
TypeFromUser *type = NULL);
Modified: lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp?rev=114928&r1=114927&r2=114928&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionDeclMap.cpp Mon Sep 27 18:54:58 2010
@@ -688,112 +688,6 @@
return true;
}
-#ifdef OLD_CODE
-Variable*
-ClangExpressionDeclMap::FindVariableInScope(const SymbolContext &sym_ctx,
- const char *name,
- TypeFromUser *type)
-{
- Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS);
-
- if (m_sym_ctx->function == NULL || m_sym_ctx->block == NULL)
- {
- if (log)
- log->Printf("function = %p, block = %p", m_sym_ctx->function, m_sym_ctx->block);
- return NULL;
- }
-
- ConstString name_cs(name);
-
- Block *current_block;
-
- for (current_block = m_sym_ctx->block;
- current_block != NULL;
- current_block = current_block->GetParent())
- {
- lldb::VariableListSP var_list = current_block->GetVariableList(false, true);
-
- if (!var_list)
- continue;
-
- lldb::VariableSP var = var_list->FindVariable(name_cs);
-
- if (!var)
- continue;
-
- // var->GetType()->GetClangAST() is the program's AST context and holds
- // var->GetType()->GetOpaqueClangQualType().
-
- // type is m_type for one of the struct members, which was added by
- // AddValueToStruct. That type was extracted from the AST context of
- // the compiler in IRForTarget. The original for the type was copied
- // out of the program's AST context by AddOneVariable.
-
- // So that we can compare these two without having to copy back
- // something we already had in the original AST context, we maintain
- // m_orig_type and m_ast_context (which are passed into
- // MaterializeOneVariable by Materialize) for each variable.
-
- if (!type)
- return var.get();
-
- if (type->GetASTContext() == var->GetType()->GetClangAST())
- {
- if (!ClangASTContext::AreTypesSame(type->GetASTContext(), type->GetOpaqueQualType(), var->GetType()->GetOpaqueClangQualType()))
- continue;
- }
- else
- {
- if (log)
- log->PutCString("Skipping a candidate variable because of different AST contexts");
- continue;
- }
-
- return var.get();
- }
-
- {
- CompileUnit *compile_unit = m_sym_ctx->comp_unit;
-
- if (!compile_unit)
- {
- if (log)
- log->Printf("compile_unit = %p", compile_unit);
- return NULL;
- }
-
- lldb::VariableListSP var_list = compile_unit->GetVariableList(true);
-
- if (!var_list)
- return NULL;
-
- lldb::VariableSP var = var_list->FindVariable(name_cs);
-
- if (!var)
- return NULL;
-
- if (!type)
- return var.get();
-
- if (type->GetASTContext() == var->GetType()->GetClangAST())
- {
- if (!ClangASTContext::AreTypesSame(type->GetASTContext(), type->GetOpaqueQualType(), var->GetType()->GetOpaqueClangQualType()))
- return NULL;
- }
- else
- {
- if (log)
- log->PutCString("Skipping a candidate variable because of different AST contexts");
- return NULL;
- }
-
- return var.get();
- }
-
- return NULL;
-}
-#endif
-
Variable *
ClangExpressionDeclMap::FindVariableInScope(StackFrame &frame,
const char *name,
@@ -926,12 +820,32 @@
if (pvar)
AddOneVariable(context, pvar);
- /* Commented out pending resolution of a loop when the TagType is imported
- lldb::TypeSP type = m_sym_ctx->FindTypeByName(name_cs);
- if (type.get())
- AddOneType(context, type.get());
- */
+ // See information on gating of this operation next to the definition for
+ // m_lookedup_types.
+
+ const char *name_uniq = name_cs.GetCString();
+
+ if (m_lookedup_types.find(name_uniq) == m_lookedup_types.end())
+ {
+ // 1 The name is added to m_lookedup_types.
+ m_lookedup_types.insert(std::pair<const char*, bool>(name_uniq, true));
+
+ // 2 The type is looked up and added, potentially causing more type loookups.
+ lldb::TypeSP type = m_sym_ctx->FindTypeByName(name_cs);
+
+ if (type.get())
+ {
+ TypeFromUser user_type(type->GetOpaqueClangQualType(),
+ type->GetClangAST());
+
+ AddOneType(context, user_type, false);
+ }
+
+ // 3 The name is removed from m_lookedup_types.
+ m_lookedup_types.erase(name_uniq);
+ }
+
}
Value *
More information about the lldb-commits
mailing list