Properly resolve merge conflict after 98ab43a

vmaksimo · vmaksimo · commit 8a15d8dabedf · 2022-01-19T18:59:19.000+03:00
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
@@ -5479,12 +5479,12 @@ class OffloadingActionBuilder final {
     }
   }
 
-  Action *makeHostLinkAction(ActionList &LinkerInputs) {
+  void makeHostLinkAction(ActionList &LinkerInputs) {
     // Build a list of device linking actions.
     ActionList DeviceAL;
     appendDeviceLinkActions(DeviceAL);
     if (DeviceAL.empty())
-      return nullptr;
+      return;
 
     // Let builders add host linking actions.
     for (DeviceActionBuilder *SB : SpecializedBuilders) {

Original file line number	Diff line number	Diff line change
`@@ -5479,12 +5479,12 @@ class OffloadingActionBuilder final {`
`5479`	`5479`	`}`
`5480`	`5480`	`}`
`5481`	`5481`
`5482`		`- Action *makeHostLinkAction(ActionList &LinkerInputs) {`
	`5482`	`+ void makeHostLinkAction(ActionList &LinkerInputs) {`
`5483`	`5483`	`// Build a list of device linking actions.`
`5484`	`5484`	`ActionList DeviceAL;`
`5485`	`5485`	`appendDeviceLinkActions(DeviceAL);`
`5486`	`5486`	`if (DeviceAL.empty())`
`5487`		`- return nullptr;`
	`5487`	`+ return;`
`5488`	`5488`
`5489`	`5489`	`// Let builders add host linking actions.`
`5490`	`5490`	`for (DeviceActionBuilder *SB : SpecializedBuilders) {`