[llvm-branch-commits] [lldb] r259525 - Merging r258485:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb  2 10:54:03 2016
New Revision: 259525

URL: http://llvm.org/viewvc/llvm-project?rev=259525&view=rev
Log:
Merging r258485:
------------------------------------------------------------------------
r258485 | bhushan.attarde | 2016-01-21 21:02:02 -0800 (Thu, 21 Jan 2016) | 9 lines

Use "_$" prefix instead of "$" for dynamic checker function inserted by LLDB during expression evaluation
    
    SUMMARY:
    The symbol "$" has a special meaning for MIPS i.e it is marker for temporary symbols for MIPS.
    So this patch uses additional _ prefix for "$__lldb_valid_pointer_check" so that it wont be marked as temporary symbol in case of MIPS.
    
    Reviewers: clayborg, spyffe
    Subscribers: dean, emaste, mohit.bhakkad, sagar, jaydeep, lldb-commits
    Differential http://reviews.llvm.org/D14111
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/source/Expression/IRDynamicChecks.cpp

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  2 10:54:03 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691-257692,257926,258621,258684-258685,258758,258761,258919,258967,259188
+/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188

Modified: lldb/branches/release_38/source/Expression/IRDynamicChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Expression/IRDynamicChecks.cpp?rev=259525&r1=259524&r2=259525&view=diff
==============================================================================
--- lldb/branches/release_38/source/Expression/IRDynamicChecks.cpp (original)
+++ lldb/branches/release_38/source/Expression/IRDynamicChecks.cpp Tue Feb  2 10:54:03 2016
@@ -35,12 +35,12 @@ using namespace lldb_private;
 
 static char ID;
 
-#define VALID_POINTER_CHECK_NAME "$__lldb_valid_pointer_check"
+#define VALID_POINTER_CHECK_NAME "_$__lldb_valid_pointer_check"
 #define VALID_OBJC_OBJECT_CHECK_NAME "$__lldb_objc_object_check"
 
 static const char g_valid_pointer_check_text[] =
 "extern \"C\" void\n"
-"$__lldb_valid_pointer_check (unsigned char *$__lldb_arg_ptr)\n"
+"_$__lldb_valid_pointer_check (unsigned char *$__lldb_arg_ptr)\n"
 "{\n"
 "    unsigned char $__lldb_local_val = *$__lldb_arg_ptr;\n"
 "}";