Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release:

MFC r309142 (by emaste):

Add WITH_LLD_AS_LD build knob

If set it installs LLD as /usr/bin/ld.  LLD (as of version 3.9) is not
capable of linking the world and kernel, but can self-host and link many
substantial applications. GNU ld continues to be used for the world and
kernel build, regardless of how this knob is set.

It is on by default for arm64, and off for all other CPU architectures.

Sponsored by:	The FreeBSD Foundation

MFC r310840:

Reapply 310775, now it also builds correctly if lldb is disabled:

Move llvm-objdump from CLANG_EXTRAS to installed by default

We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.

LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D8879

MFC r312855 (by emaste):

Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC

Reported by:	Dan McGregor <dan.mcgregor usask.ca>

MFC r313559 | glebius | 2017-02-10 18:34:48 +0100 (Fri, 10 Feb 2017) | 5 lines

Don't check struct rtentry on FreeBSD, it is an internal kernel structure.
On other systems it may be API structure for SIOCADDRT/SIOCDELRT.

Reviewed by:	emaste, dim

MFC r314152 (by jkim):

Remove an assembler flag, which is redundant since r309124.  The upstream
took care of it by introducing a macro NO_EXEC_STACK_DIRECTIVE.

http://llvm.org/viewvc/llvm-project?rev=273500&view=rev

Reviewed by:	dim

MFC r314564:

Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
4.0.0 (branches/release_40 296509).  The release will follow soon.

Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11
support to build; see UPDATING for more information.

Also note that as of 4.0.0, lld should be able to link the base system
on amd64 and aarch64.  See the WITH_LLD_IS_LLD setting in src.conf(5).
Though please be aware that this is work in progress.

Release notes for llvm, clang and lld will be available here:
<http://releases.llvm.org/4.0.0/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/clang/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/lld/docs/ReleaseNotes.html>

Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for
their help.

Relnotes:	yes
Exp-run:	antoine
PR:		215969, 216008

MFC r314708:

For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

This commit is the cause of excessive compile times on skein_block.c
(and possibly other files) during kernel builds on amd64.

We never saw the problematic behavior described in this upstream commit,
so for now it is better to revert it.  An upstream bug has been filed
here: https://bugs.llvm.org/show_bug.cgi?id=32142

Reported by:	mjg

MFC r314795:

Reapply r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

Pull in r296992 from upstream llvm trunk (by Sanjoy Das):

  [SCEV] Decrease the recursion threshold for CompareValueComplexity

  Fixes PR32142.

  r287232 accidentally increased the recursion threshold for
  CompareValueComplexity from 2 to 32.  This change reverses that
  change by introducing a separate flag for CompareValueComplexity's
  threshold.

The latter revision fixes the excessive compile times for skein_block.c.

MFC r314907 | mmel | 2017-03-08 12:40:27 +0100 (Wed, 08 Mar 2017) | 7 lines

Unbreak ARMv6 world.

The new compiler_rt library imported with clang 4.0.0 have several fatal
issues (non-functional __udivsi3 for example) with ARM specific instrict
functions. As temporary workaround, until upstream solve these problems,
disable all thumb[1][2] related feature.

MFC r315016:

Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release.
We were already very close to the last release candidate, so this is a
pretty minor update.

Relnotes:	yes

MFC r316005:

Revert r314907, and pull in r298713 from upstream compiler-rt trunk (by
Weiming Zhao):

  builtins: Select correct code fragments when compiling for Thumb1/Thum2/ARM ISA.

  Summary:
  Value of __ARM_ARCH_ISA_THUMB isn't based on the actual compilation
  mode (-mthumb, -marm), it reflect's capability of given CPU.

  Due to this:
   - use  __tbumb__ and __thumb2__ insteand of __ARM_ARCH_ISA_THUMB
   - use '.thumb' directive consistently  in all affected files
   - decorate all thumb functions using
     DEFINE_COMPILERRT_THUMB_FUNCTION()

  ---------
  Note: This patch doesn't fix broken Thumb1 variant of __udivsi3 !

  Reviewers: weimingz, rengolin, compnerd

  Subscribers: aemerson, dim

  Differential Revision: https://reviews.llvm.org/D30938

Discussed with:	mmel

1 files changed, 281 insertions, 324 deletions

diff --git a/contrib/llvm/tools/lldb/source/Expression/ExpressionSourceCode.cpp b/contrib/llvm/tools/lldb/source/Expression/ExpressionSourceCode.cpp
index 2d41d1a..90a9ff2 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ExpressionSourceCode.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ExpressionSourceCode.cpp
@@ -9,12 +9,12 @@
 
 #include "lldb/Expression/ExpressionSourceCode.h"
 
-#include "lldb/Core/StreamString.h"
 #include "Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.h"
 #include "Plugins/ExpressionParser/Clang/ClangPersistentVariables.h"
+#include "lldb/Core/StreamString.h"
+#include "lldb/Symbol/Block.h"
 #include "lldb/Symbol/CompileUnit.h"
 #include "lldb/Symbol/DebugMacros.h"
-#include "lldb/Symbol/Block.h"
 #include "lldb/Symbol/TypeSystem.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
@@ -25,8 +25,7 @@
 
 using namespace lldb_private;
 
-const char *
-ExpressionSourceCode::g_expression_prefix = R"(
+const char *ExpressionSourceCode::g_expression_prefix = R"(
 #ifndef NULL
 #define NULL (__null)
 #endif
@@ -62,366 +61,324 @@ extern "C"
 )";
 
 static const char *c_start_marker = "    /*LLDB_BODY_START*/\n    ";
-static const char *c_end_marker   = ";\n    /*LLDB_BODY_END*/\n";
+static const char *c_end_marker = ";\n    /*LLDB_BODY_END*/\n";
 
 namespace {
 
-class AddMacroState
-{
-    enum State
-    {
-        CURRENT_FILE_NOT_YET_PUSHED,
-        CURRENT_FILE_PUSHED,
-        CURRENT_FILE_POPPED
-    };
+class AddMacroState {
+  enum State {
+    CURRENT_FILE_NOT_YET_PUSHED,
+    CURRENT_FILE_PUSHED,
+    CURRENT_FILE_POPPED
+  };
 
 public:
-    AddMacroState(const FileSpec &current_file, const uint32_t current_file_line)
-        : m_state(CURRENT_FILE_NOT_YET_PUSHED),
-          m_current_file(current_file),
-          m_current_file_line(current_file_line)
-    { }
-
-    void
-    StartFile(const FileSpec &file)
-    {
-        m_file_stack.push_back(file);
-        if (file == m_current_file)
-            m_state = CURRENT_FILE_PUSHED;
-    }
+  AddMacroState(const FileSpec &current_file, const uint32_t current_file_line)
+      : m_state(CURRENT_FILE_NOT_YET_PUSHED), m_current_file(current_file),
+        m_current_file_line(current_file_line) {}
 
-    void
-    EndFile()
-    {
-        if (m_file_stack.size() == 0)
-            return;
+  void StartFile(const FileSpec &file) {
+    m_file_stack.push_back(file);
+    if (file == m_current_file)
+      m_state = CURRENT_FILE_PUSHED;
+  }
 
-        FileSpec old_top = m_file_stack.back();
-        m_file_stack.pop_back();
-        if (old_top == m_current_file)
-            m_state = CURRENT_FILE_POPPED;
-    }
+  void EndFile() {
+    if (m_file_stack.size() == 0)
+      return;
 
-    // An entry is valid if it occurs before the current line in
-    // the current file.
-    bool
-    IsValidEntry(uint32_t line)
-    {
-        switch (m_state)
-        {
-            case CURRENT_FILE_NOT_YET_PUSHED:
-                return true;
-            case CURRENT_FILE_PUSHED:
-                // If we are in file included in the current file,
-                // the entry should be added.
-                if (m_file_stack.back() != m_current_file)
-                    return true;
-
-                if (line >= m_current_file_line)
-                    return false;
-                else
-                    return true;
-            default:
-                return false;
-        }
+    FileSpec old_top = m_file_stack.back();
+    m_file_stack.pop_back();
+    if (old_top == m_current_file)
+      m_state = CURRENT_FILE_POPPED;
+  }
+
+  // An entry is valid if it occurs before the current line in
+  // the current file.
+  bool IsValidEntry(uint32_t line) {
+    switch (m_state) {
+    case CURRENT_FILE_NOT_YET_PUSHED:
+      return true;
+    case CURRENT_FILE_PUSHED:
+      // If we are in file included in the current file,
+      // the entry should be added.
+      if (m_file_stack.back() != m_current_file)
+        return true;
+
+      if (line >= m_current_file_line)
+        return false;
+      else
+        return true;
+    default:
+      return false;
     }
+  }
 
 private:
-    std::vector<FileSpec> m_file_stack;
-    State m_state;
-    FileSpec m_current_file;
-    uint32_t m_current_file_line;
+  std::vector<FileSpec> m_file_stack;
+  State m_state;
+  FileSpec m_current_file;
+  uint32_t m_current_file_line;
 };
 
 } // anonymous namespace
 
-static void
-AddMacros(const DebugMacros *dm, CompileUnit *comp_unit, AddMacroState &state, StreamString &stream)
-{
-    if (dm == nullptr)
-        return;
+static void AddMacros(const DebugMacros *dm, CompileUnit *comp_unit,
+                      AddMacroState &state, StreamString &stream) {
+  if (dm == nullptr)
+    return;
 
-    for (size_t i = 0; i < dm->GetNumMacroEntries(); i++)
-    {
-        const DebugMacroEntry &entry = dm->GetMacroEntryAtIndex(i);
-        uint32_t line;
-
-        switch (entry.GetType())
-        {
-            case DebugMacroEntry::DEFINE:
-                if (state.IsValidEntry(entry.GetLineNumber()))
-                    stream.Printf("#define %s\n", entry.GetMacroString().AsCString());
-                else
-                    return;
-                break;
-            case DebugMacroEntry::UNDEF:
-                if (state.IsValidEntry(entry.GetLineNumber()))
-                    stream.Printf("#undef %s\n", entry.GetMacroString().AsCString());
-                else
-                    return;
-                break;
-            case DebugMacroEntry::START_FILE:
-                line = entry.GetLineNumber();
-                if (state.IsValidEntry(line))
-                    state.StartFile(entry.GetFileSpec(comp_unit));
-                else
-                    return;
-                break;
-            case DebugMacroEntry::END_FILE:
-                state.EndFile();
-                break;
-            case DebugMacroEntry::INDIRECT:
-                AddMacros(entry.GetIndirectDebugMacros(), comp_unit, state, stream);
-                break;
-            default:
-                // This is an unknown/invalid entry. Ignore.
-                break;
-        }
+  for (size_t i = 0; i < dm->GetNumMacroEntries(); i++) {
+    const DebugMacroEntry &entry = dm->GetMacroEntryAtIndex(i);
+    uint32_t line;
+
+    switch (entry.GetType()) {
+    case DebugMacroEntry::DEFINE:
+      if (state.IsValidEntry(entry.GetLineNumber()))
+        stream.Printf("#define %s\n", entry.GetMacroString().AsCString());
+      else
+        return;
+      break;
+    case DebugMacroEntry::UNDEF:
+      if (state.IsValidEntry(entry.GetLineNumber()))
+        stream.Printf("#undef %s\n", entry.GetMacroString().AsCString());
+      else
+        return;
+      break;
+    case DebugMacroEntry::START_FILE:
+      line = entry.GetLineNumber();
+      if (state.IsValidEntry(line))
+        state.StartFile(entry.GetFileSpec(comp_unit));
+      else
+        return;
+      break;
+    case DebugMacroEntry::END_FILE:
+      state.EndFile();
+      break;
+    case DebugMacroEntry::INDIRECT:
+      AddMacros(entry.GetIndirectDebugMacros(), comp_unit, state, stream);
+      break;
+    default:
+      // This is an unknown/invalid entry. Ignore.
+      break;
     }
+  }
 }
 
-static void
-AddLocalVariableDecls(const lldb::VariableListSP &var_list_sp, StreamString &stream)
-{
-    for (size_t i = 0; i < var_list_sp->GetSize(); i++)
-    {
-        lldb::VariableSP var_sp = var_list_sp->GetVariableAtIndex(i);
+static void AddLocalVariableDecls(const lldb::VariableListSP &var_list_sp,
+                                  StreamString &stream) {
+  for (size_t i = 0; i < var_list_sp->GetSize(); i++) {
+    lldb::VariableSP var_sp = var_list_sp->GetVariableAtIndex(i);
 
-        ConstString var_name = var_sp->GetName();
-        if (!var_name || var_name == ConstString("this") || var_name == ConstString(".block_descriptor"))
-            continue;
+    ConstString var_name = var_sp->GetName();
+    if (!var_name || var_name == ConstString("this") ||
+        var_name == ConstString(".block_descriptor"))
+      continue;
 
-        stream.Printf("using $__lldb_local_vars::%s;\n", var_name.AsCString());
-    }
+    stream.Printf("using $__lldb_local_vars::%s;\n", var_name.AsCString());
+  }
 }
 
-bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrapping_language, bool static_method, ExecutionContext &exe_ctx) const
-{
-    const char *target_specific_defines = "typedef signed char BOOL;\n";
-    std::string module_macros;
-    
-    Target *target = exe_ctx.GetTargetPtr();
-    if (target)
-    {
-        if (target->GetArchitecture().GetMachine() == llvm::Triple::aarch64)
-        {
-            target_specific_defines = "typedef bool BOOL;\n";
-        }
-        if (target->GetArchitecture().GetMachine() == llvm::Triple::x86_64)
-        {
-            if (lldb::PlatformSP platform_sp = target->GetPlatform())
-            {
-                static ConstString g_platform_ios_simulator ("ios-simulator");
-                if (platform_sp->GetPluginName() == g_platform_ios_simulator)
-                {
-                    target_specific_defines = "typedef bool BOOL;\n";
-                }
-            }
+bool ExpressionSourceCode::GetText(std::string &text,
+                                   lldb::LanguageType wrapping_language,
+                                   bool static_method,
+                                   ExecutionContext &exe_ctx) const {
+  const char *target_specific_defines = "typedef signed char BOOL;\n";
+  std::string module_macros;
+
+  Target *target = exe_ctx.GetTargetPtr();
+  if (target) {
+    if (target->GetArchitecture().GetMachine() == llvm::Triple::aarch64) {
+      target_specific_defines = "typedef bool BOOL;\n";
+    }
+    if (target->GetArchitecture().GetMachine() == llvm::Triple::x86_64) {
+      if (lldb::PlatformSP platform_sp = target->GetPlatform()) {
+        static ConstString g_platform_ios_simulator("ios-simulator");
+        if (platform_sp->GetPluginName() == g_platform_ios_simulator) {
+          target_specific_defines = "typedef bool BOOL;\n";
         }
-        
-        if (ClangModulesDeclVendor *decl_vendor = target->GetClangModulesDeclVendor())
-        {
-            ClangPersistentVariables *persistent_vars = llvm::cast<ClangPersistentVariables>(target->GetPersistentExpressionStateForLanguage(lldb::eLanguageTypeC));
-            const ClangModulesDeclVendor::ModuleVector &hand_imported_modules = persistent_vars->GetHandLoadedClangModules();
-            ClangModulesDeclVendor::ModuleVector modules_for_macros;
-            
-            for (ClangModulesDeclVendor::ModuleID module : hand_imported_modules)
-            {
-                modules_for_macros.push_back(module);
-            }
-            
-            if (target->GetEnableAutoImportClangModules())
-            {
-                if (StackFrame *frame = exe_ctx.GetFramePtr())
-                {
-                    if (Block *block = frame->GetFrameBlock())
-                    {
-                        SymbolContext sc;
-                        
-                        block->CalculateSymbolContext(&sc);
-                        
-                        if (sc.comp_unit)
-                        {
-                            StreamString error_stream;
-                            
-                            decl_vendor->AddModulesForCompileUnit(*sc.comp_unit, modules_for_macros, error_stream);
-                        }
-                    }
-                }
+      }
+    }
+
+    if (ClangModulesDeclVendor *decl_vendor =
+            target->GetClangModulesDeclVendor()) {
+      ClangPersistentVariables *persistent_vars =
+          llvm::cast<ClangPersistentVariables>(
+              target->GetPersistentExpressionStateForLanguage(
+                  lldb::eLanguageTypeC));
+      const ClangModulesDeclVendor::ModuleVector &hand_imported_modules =
+          persistent_vars->GetHandLoadedClangModules();
+      ClangModulesDeclVendor::ModuleVector modules_for_macros;
+
+      for (ClangModulesDeclVendor::ModuleID module : hand_imported_modules) {
+        modules_for_macros.push_back(module);
+      }
+
+      if (target->GetEnableAutoImportClangModules()) {
+        if (StackFrame *frame = exe_ctx.GetFramePtr()) {
+          if (Block *block = frame->GetFrameBlock()) {
+            SymbolContext sc;
+
+            block->CalculateSymbolContext(&sc);
+
+            if (sc.comp_unit) {
+              StreamString error_stream;
+
+              decl_vendor->AddModulesForCompileUnit(
+                  *sc.comp_unit, modules_for_macros, error_stream);
             }
-            
-            decl_vendor->ForEachMacro(modules_for_macros, [&module_macros] (const std::string &expansion) -> bool {
-                module_macros.append(expansion);
-                module_macros.append("\n");
-                return false;
-            });
+          }
         }
+      }
 
+      decl_vendor->ForEachMacro(
+          modules_for_macros,
+          [&module_macros](const std::string &expansion) -> bool {
+            module_macros.append(expansion);
+            module_macros.append("\n");
+            return false;
+          });
     }
+  }
 
-    StreamString debug_macros_stream;
-    StreamString lldb_local_var_decls;
-    if (StackFrame *frame = exe_ctx.GetFramePtr())
-    {
-        const SymbolContext &sc = frame->GetSymbolContext(
-           lldb:: eSymbolContextCompUnit | lldb::eSymbolContextLineEntry);
-
-        if (sc.comp_unit && sc.line_entry.IsValid())
-        {
-            DebugMacros *dm = sc.comp_unit->GetDebugMacros();
-            if (dm)
-            {
-                AddMacroState state(sc.line_entry.file, sc.line_entry.line);
-                AddMacros(dm, sc.comp_unit, state, debug_macros_stream);
-            }
-        }
+  StreamString debug_macros_stream;
+  StreamString lldb_local_var_decls;
+  if (StackFrame *frame = exe_ctx.GetFramePtr()) {
+    const SymbolContext &sc = frame->GetSymbolContext(
+        lldb::eSymbolContextCompUnit | lldb::eSymbolContextLineEntry);
 
-        ConstString object_name;
-        if (Language::LanguageIsCPlusPlus(frame->GetLanguage()))
-        {
-            if (target->GetInjectLocalVariables(&exe_ctx))
-            {
-                lldb::VariableListSP var_list_sp = frame->GetInScopeVariableList(false, true);
-                AddLocalVariableDecls(var_list_sp, lldb_local_var_decls);
-            }
-        }
+    if (sc.comp_unit && sc.line_entry.IsValid()) {
+      DebugMacros *dm = sc.comp_unit->GetDebugMacros();
+      if (dm) {
+        AddMacroState state(sc.line_entry.file, sc.line_entry.line);
+        AddMacros(dm, sc.comp_unit, state, debug_macros_stream);
+      }
     }
 
-    if (m_wrap)
-    {
-        switch (wrapping_language) 
-        {
-        default:
-            return false;
-        case lldb::eLanguageTypeC:
-        case lldb::eLanguageTypeC_plus_plus:
-        case lldb::eLanguageTypeObjC:
-            break;
-        }
-        
-        StreamString wrap_stream;
-        
-        wrap_stream.Printf("%s\n%s\n%s\n%s\n%s\n",
-                           module_macros.c_str(),
-                           debug_macros_stream.GetData(),
-                           g_expression_prefix,
-                           target_specific_defines,
-                           m_prefix.c_str());
-        
-        // First construct a tagged form of the user expression so we can find it later:
-        std::string tagged_body;
-        switch (wrapping_language)
-        {
-            default:
-                tagged_body = m_body;
-                break;
-            case lldb::eLanguageTypeC:
-            case lldb::eLanguageTypeC_plus_plus:
-            case lldb::eLanguageTypeObjC:
-                tagged_body.append(c_start_marker);
-                tagged_body.append(m_body);
-                tagged_body.append(c_end_marker);
-                break;
-            
-        }
-        switch (wrapping_language) 
-        {
-        default:
-            break;
-        case lldb::eLanguageTypeC:
-            wrap_stream.Printf("void                           \n"
-                               "%s(void *$__lldb_arg)          \n"
-                               "{                              \n"
-                               "    %s;                        \n"
-                               "%s"
-                               "}                              \n",
-                               m_name.c_str(),
-                               lldb_local_var_decls.GetData(),
-                               tagged_body.c_str());
-            break;
-        case lldb::eLanguageTypeC_plus_plus:
-            wrap_stream.Printf("void                                   \n"
-                               "$__lldb_class::%s(void *$__lldb_arg)   \n"
-                               "{                                      \n"
-                               "    %s;                                \n"
-                               "%s"
-                               "}                                      \n",
-                               m_name.c_str(),
-                               lldb_local_var_decls.GetData(),
-                               tagged_body.c_str());
-            break;
-        case lldb::eLanguageTypeObjC:
-            if (static_method)
-            {
-                wrap_stream.Printf("@interface $__lldb_objc_class ($__lldb_category)        \n"
-                                   "+(void)%s:(void *)$__lldb_arg;                          \n"
-                                   "@end                                                    \n"
-                                   "@implementation $__lldb_objc_class ($__lldb_category)   \n"
-                                   "+(void)%s:(void *)$__lldb_arg                           \n"
-                                   "{                                                       \n"
-                                   "%s"
-                                   "}                                                       \n"
-                                   "@end                                                    \n",
-                                   m_name.c_str(),
-                                   m_name.c_str(),
-                                   tagged_body.c_str());
-            }
-            else
-            {
-                wrap_stream.Printf("@interface $__lldb_objc_class ($__lldb_category)       \n"
-                                   "-(void)%s:(void *)$__lldb_arg;                         \n"
-                                   "@end                                                   \n"
-                                   "@implementation $__lldb_objc_class ($__lldb_category)  \n"
-                                   "-(void)%s:(void *)$__lldb_arg                          \n"
-                                   "{                                                      \n"
-                                   "%s"
-                                   "}                                                      \n"
-                                   "@end                                                   \n",
-                                   m_name.c_str(),
-                                   m_name.c_str(),
-                                   tagged_body.c_str());
-            }
-            break;
-        }
-        
-        text = wrap_stream.GetString();
+    ConstString object_name;
+    if (Language::LanguageIsCPlusPlus(frame->GetLanguage())) {
+      if (target->GetInjectLocalVariables(&exe_ctx)) {
+        lldb::VariableListSP var_list_sp =
+            frame->GetInScopeVariableList(false, true);
+        AddLocalVariableDecls(var_list_sp, lldb_local_var_decls);
+      }
     }
-    else
-    {
-        text.append(m_body);
+  }
+
+  if (m_wrap) {
+    switch (wrapping_language) {
+    default:
+      return false;
+    case lldb::eLanguageTypeC:
+    case lldb::eLanguageTypeC_plus_plus:
+    case lldb::eLanguageTypeObjC:
+      break;
     }
 
-    return true;
-}
+    StreamString wrap_stream;
 
-bool
-ExpressionSourceCode::GetOriginalBodyBounds(std::string transformed_text,
-                                            lldb::LanguageType wrapping_language,
-                                            size_t &start_loc,
-                                            size_t &end_loc)
-{
-    const char *start_marker;
-    const char *end_marker;
-    
-    switch (wrapping_language)
-    {
+    wrap_stream.Printf("%s\n%s\n%s\n%s\n%s\n", module_macros.c_str(),
+                       debug_macros_stream.GetData(), g_expression_prefix,
+                       target_specific_defines, m_prefix.c_str());
+
+    // First construct a tagged form of the user expression so we can find it
+    // later:
+    std::string tagged_body;
+    switch (wrapping_language) {
     default:
-        return false;
+      tagged_body = m_body;
+      break;
     case lldb::eLanguageTypeC:
     case lldb::eLanguageTypeC_plus_plus:
     case lldb::eLanguageTypeObjC:
-        start_marker = c_start_marker;
-        end_marker = c_end_marker;
-        break;
+      tagged_body.append(c_start_marker);
+      tagged_body.append(m_body);
+      tagged_body.append(c_end_marker);
+      break;
     }
-    
-    start_loc = transformed_text.find(start_marker);
-    if (start_loc == std::string::npos)
-        return false;
-    start_loc += strlen(start_marker);
-    end_loc  = transformed_text.find(end_marker);
-    if (end_loc == std::string::npos)
-        return false;
-    return true;
+    switch (wrapping_language) {
+    default:
+      break;
+    case lldb::eLanguageTypeC:
+      wrap_stream.Printf("void                           \n"
+                         "%s(void *$__lldb_arg)          \n"
+                         "{                              \n"
+                         "    %s;                        \n"
+                         "%s"
+                         "}                              \n",
+                         m_name.c_str(), lldb_local_var_decls.GetData(),
+                         tagged_body.c_str());
+      break;
+    case lldb::eLanguageTypeC_plus_plus:
+      wrap_stream.Printf("void                                   \n"
+                         "$__lldb_class::%s(void *$__lldb_arg)   \n"
+                         "{                                      \n"
+                         "    %s;                                \n"
+                         "%s"
+                         "}                                      \n",
+                         m_name.c_str(), lldb_local_var_decls.GetData(),
+                         tagged_body.c_str());
+      break;
+    case lldb::eLanguageTypeObjC:
+      if (static_method) {
+        wrap_stream.Printf(
+            "@interface $__lldb_objc_class ($__lldb_category)        \n"
+            "+(void)%s:(void *)$__lldb_arg;                          \n"
+            "@end                                                    \n"
+            "@implementation $__lldb_objc_class ($__lldb_category)   \n"
+            "+(void)%s:(void *)$__lldb_arg                           \n"
+            "{                                                       \n"
+            "%s"
+            "}                                                       \n"
+            "@end                                                    \n",
+            m_name.c_str(), m_name.c_str(), tagged_body.c_str());
+      } else {
+        wrap_stream.Printf(
+            "@interface $__lldb_objc_class ($__lldb_category)       \n"
+            "-(void)%s:(void *)$__lldb_arg;                         \n"
+            "@end                                                   \n"
+            "@implementation $__lldb_objc_class ($__lldb_category)  \n"
+            "-(void)%s:(void *)$__lldb_arg                          \n"
+            "{                                                      \n"
+            "%s"
+            "}                                                      \n"
+            "@end                                                   \n",
+            m_name.c_str(), m_name.c_str(), tagged_body.c_str());
+      }
+      break;
+    }
+
+    text = wrap_stream.GetString();
+  } else {
+    text.append(m_body);
+  }
+
+  return true;
 }
 
+bool ExpressionSourceCode::GetOriginalBodyBounds(
+    std::string transformed_text, lldb::LanguageType wrapping_language,
+    size_t &start_loc, size_t &end_loc) {
+  const char *start_marker;
+  const char *end_marker;
+
+  switch (wrapping_language) {
+  default:
+    return false;
+  case lldb::eLanguageTypeC:
+  case lldb::eLanguageTypeC_plus_plus:
+  case lldb::eLanguageTypeObjC:
+    start_marker = c_start_marker;
+    end_marker = c_end_marker;
+    break;
+  }
+
+  start_loc = transformed_text.find(start_marker);
+  if (start_loc == std::string::npos)
+    return false;
+  start_loc += strlen(start_marker);
+  end_loc = transformed_text.find(end_marker);
+  if (end_loc == std::string::npos)
+    return false;
+  return true;
+}