* adapt to changed in mulle-objc-runtime 0.14.0

Codeon-GmbH · Oct 1, 2018 · e7e06d4 · e7e06d4
1 parent ce5d21d
commit e7e06d4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCRuntime.cpp b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCRuntime.cpp
@@ -309,26 +309,26 @@ static bool _IsSymbolARuntimeThunk(const Symbol &symbol) {
 // *** object calls ***
 
   static ConstString g_c_01 = ConstString( "mulle_objc_object_call");
-  static ConstString g_c_02 = ConstString( "mulle_objc_object_inline_constant_methodid_call");
-  static ConstString g_c_03 = ConstString( "mulle_objc_object_constant_methodid_call");
-  static ConstString g_c_04 = ConstString( "mulle_objc_object_inline_variable_methodid_call");
+  static ConstString g_c_02 = ConstString( "mulle_objc_object_inlinecall_constantmethodid");
+  static ConstString g_c_03 = ConstString( "mulle_objc_object_call_constantmethodid");
+  static ConstString g_c_04 = ConstString( "mulle_objc_object_inlinecall_variablemethodid");
   static ConstString g_c_05 = ConstString( "mulle_objc_objects_call");
 
 // *** internal calls ***
 
   static ConstString g_c_06 = ConstString( "_mulle_objc_object_call2");
-  static ConstString g_c_07 = ConstString( "_mulle_objc_object_call2_empty_cache");
-  static ConstString g_c_08 = ConstString( "_mulle_objc_object_call2_needs_cache");
+  static ConstString g_c_07 = ConstString( "_mulle_objc_object_call2_emptycache");
+  static ConstString g_c_08 = ConstString( "_mulle_objc_object_call2_needcache");
   static ConstString g_c_09 = ConstString( "_mulle_objc_object_call_class");
-  static ConstString g_c_10 = ConstString( "_mulle_objc_object_call_class_needs_cache");
-  static ConstString g_c_11 = ConstString( "_mulle_objc_object_unfailingcall_methodid");
-  static ConstString g_c_12 = ConstString( "_mulle_objc_object_noncachingcall_class");
+  static ConstString g_c_10 = ConstString( "_mulle_objc_object_call_class_needcache");
+  static ConstString g_c_11 = ConstString( "_mulle_objc_object_call_methodid_nofail");
+  static ConstString g_c_12 = ConstString( "_mulle_objc_object_call_class_nocache");
 
 
 // *** super calls ***
   static ConstString g_c_13 = ConstString( "_mulle_objc_object_supercall");
-  static ConstString g_c_14 = ConstString( "_mulle_objc_object_inline_supercall");
-  static ConstString g_c_15 = ConstString( "_mulle_objc_object_partialinline_supercall");
+  static ConstString g_c_14 = ConstString( "_mulle_objc_object_inlinesupercall");
+  static ConstString g_c_15 = ConstString( "_mulle_objc_object_partialinlinesupercall");
 
 
 

diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCRuntimeV1.cpp b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCRuntimeV1.cpp
@@ -142,10 +142,12 @@ static char   object_checker_c[] =
 UtilityFunction *MulleObjCRuntimeV1::CreateObjectChecker(const char *name) {
   std::unique_ptr<BufStruct> buf(new BufStruct);
 
+#ifndef NDEBUG
   int strformatsize = snprintf(&buf->contents[0], sizeof(buf->contents),
                                object_checker_c,
                   name);
   assert(strformatsize < (int)sizeof(buf->contents));
+#endif
 
   Status error;
   return GetTargetRef().GetUtilityFunctionForLanguage(

diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp
@@ -69,7 +69,7 @@ MulleObjCTrampolineHandler::~MulleObjCTrampolineHandler() {}
 //   _mulle_objc_object_supercall
 //
 // We should also step through
-//   mulle_objc_unfailingfastlookup_infraclass
+//   mulle_objc_fastlookup_infraclass_nofail
 // but we can't for now.
 //
 const MulleObjCTrampolineHandler::DispatchFunction
@@ -184,7 +184,7 @@ MulleObjCTrampolineHandler::MulleObjCTrampolineHandler(
   }
 
   m_classlookup_addr = LookupFunctionSymbol( process_sp,
-                                             "mulle_objc_unfailingfastlookup_infraclass");
+                                             "mulle_objc_fastlookup_infraclass_nofail");
 }
 
 
@@ -633,7 +633,7 @@ MulleObjCTrampolineHandler::GetStepThroughDispatchPlan( Thread &thread,
       // Yup, it was in the cache, so we can run to that address directly.
 
       if (log)
-         log->Printf ("Mulle: Found implementation address in cache: 0x%. Return run to address plan." PRIx64, impl_addr);
+         log->Printf ("Mulle: Found implementation address in cache: 0x%" PRIx64 ". Return run to address plan.", impl_addr);
 
       ret_plan_sp.reset (new ThreadPlanRunToAddress (thread, impl_addr, stop_others));
       // fprintf( stderr, "cached return\n");