Merge pull request #1874 from adrian-prantl/cleanup-unused

 Remove what appears to be unnecessary code

Author: adrian-prantl

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -615,10 +615,6 @@ static void AddVariableInfo(
     var_type = valobj_sp->GetCompilerType();
   }
 
-  if (!var_type.IsValid())
-    if (Type *var_lldb_type = variable_sp->GetType())
-      var_type = var_lldb_type->GetFullCompilerType();
-
   if (!var_type.IsValid())
     return;
 

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -1204,6 +1204,9 @@ bool Equivalent<llvm::Optional<uint64_t>>(llvm::Optional<uint64_t> l,
   // thus assume that a larger number is "better".
   if (l.hasValue() && r.hasValue() && *l > *r)
     return true;
+  // Assume that any value is "better" than none.
+  if (l.hasValue() && !r.hasValue())
+    return true;
   llvm::dbgs() << l << " != " << r << "\n";
   return false;
 }