Merge pull request #1675 from apple/compnerd-return-type-mismatch

compnerd · web-flow · commit 4314ffcebe53 · 2020-08-18T13:44:37.000-07:00
Swift: Fix the Windows build
diff --git a/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.cpp b/lldb/source/Plugins/Language/Swift/SwiftUnsafeTypes.cpp
@@ -313,7 +313,7 @@ bool SwiftUnsafePointer::Update() {
     LLDB_LOG(GetLogIfAllCategoriesSet(LIBLLDB_LOG_DATAFORMATTERS),
              "{0}: Couldn't get {1} type system.", __FUNCTION__,
              type.GetTypeName());
-    return nullptr;
+    return false;
   }
 
   CompilerType argument_type =

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ bool SwiftUnsafePointer::Update() {`
`313`	`313`	`LLDB_LOG(GetLogIfAllCategoriesSet(LIBLLDB_LOG_DATAFORMATTERS),`
`314`	`314`	`"{0}: Couldn't get {1} type system.", __FUNCTION__,`
`315`	`315`	`type.GetTypeName());`
`316`		`- return nullptr;`
	`316`	`+ return false;`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`CompilerType argument_type =`