@@ -1178,28 +1178,6 @@ AppleObjCRuntimeV2::GetClassDescriptorFromISA(ObjCISA isa) {
1178
1178
return class_descriptor_sp;
1179
1179
}
1180
1180
1181
- static std::pair<bool , ConstString> ObjCGetClassNameRaw (
1182
- AppleObjCRuntime::ObjCISA isa,
1183
- Process *process) {
1184
- StreamString expr_string;
1185
- std::string input = std::to_string (isa);
1186
- expr_string.Printf (" (const char *)objc_debug_class_getNameRaw(%s)" ,
1187
- input.c_str ());
1188
-
1189
- ValueObjectSP result_sp;
1190
- EvaluateExpressionOptions eval_options;
1191
- eval_options.SetLanguage (lldb::eLanguageTypeObjC);
1192
- eval_options.SetResultIsInternal (true );
1193
- eval_options.SetGenerateDebugInfo (true );
1194
- eval_options.SetTimeout (process->GetUtilityExpressionTimeout ());
1195
- auto eval_result = process->GetTarget ().EvaluateExpression (
1196
- expr_string.GetData (),
1197
- process->GetThreadList ().GetSelectedThread ()->GetSelectedFrame ().get (),
1198
- result_sp, eval_options);
1199
- ConstString type_name (result_sp->GetSummaryAsCString ());
1200
- return std::make_pair (eval_result == eExpressionCompleted, type_name);
1201
- }
1202
-
1203
1181
ObjCLanguageRuntime::ClassDescriptorSP
1204
1182
AppleObjCRuntimeV2::GetClassDescriptor (ValueObject &valobj) {
1205
1183
ClassDescriptorSP objc_class_sp;
@@ -1235,10 +1213,7 @@ AppleObjCRuntimeV2::GetClassDescriptor(ValueObject &valobj) {
1235
1213
return objc_class_sp;
1236
1214
1237
1215
objc_class_sp = GetClassDescriptorFromISA (isa);
1238
-
1239
- if (objc_class_sp)
1240
- return objc_class_sp;
1241
- else {
1216
+ if (isa && !objc_class_sp) {
1242
1217
Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS |
1243
1218
LIBLLDB_LOG_TYPES));
1244
1219
LLDB_LOGF (log,
@@ -1247,13 +1222,6 @@ AppleObjCRuntimeV2::GetClassDescriptor(ValueObject &valobj) {
1247
1222
" not in class descriptor cache 0x%" PRIx64,
1248
1223
isa_pointer, isa);
1249
1224
}
1250
-
1251
- ClassDescriptorSP descriptor_sp (new ClassDescriptorV2 (*this , isa, nullptr ));
1252
- auto resolved = ObjCGetClassNameRaw (isa, process);
1253
- if (resolved.first == true ) {
1254
- AddClass (isa, descriptor_sp, resolved.second .AsCString ());
1255
- objc_class_sp = descriptor_sp;
1256
- }
1257
1225
return objc_class_sp;
1258
1226
}
1259
1227
0 commit comments