[Comgr] Failure to build driver results in undefined-behaviour

Change-Id: I4373dd9f51b724f83d11864a8fa5e561a3858548

Author: jmmartinez

amd/comgr/src/comgr-compiler.cpp

@@ -686,10 +686,10 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
   }
 
   std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(Args));
-  if (!C) {
-    return C->containsError() ? AMD_COMGR_STATUS_ERROR
-                              : AMD_COMGR_STATUS_SUCCESS;
+  if (!C || C->containsError()) {
+    return AMD_COMGR_STATUS_ERROR;
   }
+
   for (auto &Job : C->getJobs()) {
     auto Arguments = Job.getArguments();
     SmallVector<const char *, 128> Argv;

amd/comgr/test/CMakeLists.txt

@@ -224,6 +224,7 @@ add_comgr_test(get_data_isa_name_test c)
 add_comgr_test(include_subdirectory_test c)
 add_comgr_test(options_test c)
 add_comgr_test(demangle_test c)
+add_comgr_test(fail_to_build_driver c)
 add_comgr_test(file_map c)
 add_comgr_test(lookup_code_object_test c)
 add_comgr_test(symbolize_test c)

amd/comgr/test/common.h

@@ -92,8 +92,9 @@ int setBuf(const char *infile, char **buf) {
   return size;
 }
 
-void checkError(amd_comgr_status_t status, const char *str) {
-  if (status != AMD_COMGR_STATUS_SUCCESS) {
+void checkStatus(amd_comgr_status_t status, amd_comgr_status_t expected,
+                 const char *str) {
+  if (status != expected) {
     const char *statusStr;
     printf("FAILED: %s\n", str);
     status = amd_comgr_status_string(status, &statusStr);
@@ -103,6 +104,10 @@ void checkError(amd_comgr_status_t status, const char *str) {
   }
 }
 
+void checkError(amd_comgr_status_t status, const char *str) {
+  checkStatus(status, AMD_COMGR_STATUS_SUCCESS, str);
+}
+
 void dumpData(amd_comgr_data_t Data, const char *OutFile) {
   size_t size;
   char *bytes = NULL;

amd/comgr/test/fail_to_build_driver.c

@@ -0,0 +1,96 @@
+/*******************************************************************************
+ *
+ * University of Illinois/NCSA
+ * Open Source License
+ *
+ * Copyright (c) 2018 Advanced Micro Devices, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * with the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimers.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimers in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *     * Neither the names of Advanced Micro Devices, Inc. nor the names of its
+ *       contributors may be used to endorse or promote products derived from
+ *       this Software without specific prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
+ * THE SOFTWARE.
+ *
+ ******************************************************************************/
+
+#include "amd_comgr.h"
+#include "common.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(int argc, char *argv[]) {
+  char *BufSource1;
+  size_t SizeSource1, SizeSource2, SizeInclude;
+  amd_comgr_data_t DataSource1, DataSource2, DataInclude;
+  amd_comgr_data_set_t DataSetIn, DataSetBc;
+  amd_comgr_action_info_t DataAction;
+  amd_comgr_status_t Status;
+  size_t Count;
+  const char *CodeGenOptions[] = {"-this-is-a-non-existent-flag"};
+  size_t CodeGenOptionsCount =
+      sizeof(CodeGenOptions) / sizeof(CodeGenOptions[0]);
+
+  SizeSource1 = setBuf(TEST_OBJ_DIR "/source1.cl", &BufSource1);
+
+  Status = amd_comgr_create_data_set(&DataSetIn);
+  checkError(Status, "amd_comgr_create_data_set");
+
+  Status = amd_comgr_create_data(AMD_COMGR_DATA_KIND_SOURCE, &DataSource1);
+  checkError(Status, "amd_comgr_create_data");
+  Status = amd_comgr_set_data(DataSource1, SizeSource1, BufSource1);
+  checkError(Status, "amd_comgr_set_data");
+  Status = amd_comgr_set_data_name(DataSource1, "source1.cl");
+  checkError(Status, "amd_comgr_set_data_name");
+  Status = amd_comgr_data_set_add(DataSetIn, DataSource1);
+  checkError(Status, "amd_comgr_data_set_add");
+
+  Status = amd_comgr_create_action_info(&DataAction);
+  checkError(Status, "amd_comgr_create_action_info");
+  Status = amd_comgr_action_info_set_language(DataAction,
+                                              AMD_COMGR_LANGUAGE_OPENCL_1_2);
+  checkError(Status, "amd_comgr_action_info_set_language");
+  Status = amd_comgr_action_info_set_isa_name(DataAction,
+                                              "amdgcn-amd-amdhsa--gfx900");
+  checkError(Status, "amd_comgr_action_info_set_isa_name");
+  Status = amd_comgr_action_info_set_option_list(DataAction, CodeGenOptions,
+                                                 CodeGenOptionsCount);
+  checkError(Status, "amd_comgr_action_info_set_option_list");
+
+  Status = amd_comgr_create_data_set(&DataSetBc);
+  checkError(Status, "amd_comgr_create_data_set");
+
+  Status = amd_comgr_do_action(AMD_COMGR_ACTION_COMPILE_SOURCE_TO_BC,
+                               DataAction, DataSetIn, DataSetBc);
+  checkStatus(Status, AMD_COMGR_STATUS_ERROR, "amd_comgr_do_action");
+
+  Status = amd_comgr_release_data(DataSource1);
+  checkError(Status, "amd_comgr_release_data");
+  Status = amd_comgr_destroy_data_set(DataSetIn);
+  checkError(Status, "amd_comgr_destroy_data_set");
+  Status = amd_comgr_destroy_data_set(DataSetBc);
+  checkError(Status, "amd_comgr_destroy_data_set");
+  Status = amd_comgr_destroy_action_info(DataAction);
+  checkError(Status, "amd_comgr_destroy_action_info");
+  free(BufSource1);
+}