[PATCH] D132538: [AArch64] Filter out invalid code model in frontend.

[Hsiangkai Wang via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGa8690143057b: [AArch64] Filter out invalid code model in 
frontend. (authored by HsiangKai).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D132538/new/

https://reviews.llvm.org/D132538

Files:
  clang/lib/Driver/ToolChains/Clang.cpp
  clang/test/Driver/mcmodel.c


Index: clang/test/Driver/mcmodel.c
===================================================================
--- clang/test/Driver/mcmodel.c
+++ clang/test/Driver/mcmodel.c
@@ -6,6 +6,8 @@
 // RUN: %clang -target powerpc-unknown-aix -### -S -mcmodel=medium %s 2> %t.log
 // RUN: FileCheck --check-prefix=AIX-MCMEDIUM-OVERRIDE %s < %t.log
 // RUN: not %clang -c -mcmodel=lager %s 2>&1 | FileCheck 
--check-prefix=INVALID %s
+// RUN: not %clang -c -target aarch64 -mcmodel=medium %s 2>&1 | FileCheck 
--check-prefix=AARCH64-MEDIUM %s
+// RUN: not %clang -c -target aarch64 -mcmodel=kernel %s 2>&1 | FileCheck 
--check-prefix=AARCH64-KERNEL %s
 
 // TINY: "-mcmodel=tiny"
 // SMALL: "-mcmodel=small"
@@ -15,3 +17,6 @@
 // AIX-MCMEDIUM-OVERRIDE: "-mcmodel=large"
 
 // INVALID: error: invalid argument 'lager' to -mcmodel=
+
+// AARCH64-MEDIUM: error: invalid argument 'medium' to -mcmodel=
+// AARCH64-KERNEL: error: invalid argument 'kernel' to -mcmodel=
Index: clang/lib/Driver/ToolChains/Clang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Clang.cpp
+++ clang/lib/Driver/ToolChains/Clang.cpp
@@ -5421,6 +5421,9 @@
         CM == "tiny") {
       if (Triple.isOSAIX() && CM == "medium")
         CmdArgs.push_back("-mcmodel=large");
+      else if (Triple.isAArch64() && (CM == "kernel" || CM == "medium"))
+        D.Diag(diag::err_drv_invalid_argument_to_option)
+            << CM << A->getOption().getName();
       else
         A->render(Args, CmdArgs);
     } else {



Index: clang/test/Driver/mcmodel.c
===================================================================
--- clang/test/Driver/mcmodel.c
+++ clang/test/Driver/mcmodel.c
@@ -6,6 +6,8 @@
 // RUN: %clang -target powerpc-unknown-aix -### -S -mcmodel=medium %s 2> %t.log
 // RUN: FileCheck --check-prefix=AIX-MCMEDIUM-OVERRIDE %s < %t.log
 // RUN: not %clang -c -mcmodel=lager %s 2>&1 | FileCheck --check-prefix=INVALID %s
+// RUN: not %clang -c -target aarch64 -mcmodel=medium %s 2>&1 | FileCheck --check-prefix=AARCH64-MEDIUM %s
+// RUN: not %clang -c -target aarch64 -mcmodel=kernel %s 2>&1 | FileCheck --check-prefix=AARCH64-KERNEL %s
 
 // TINY: "-mcmodel=tiny"
 // SMALL: "-mcmodel=small"
@@ -15,3 +17,6 @@
 // AIX-MCMEDIUM-OVERRIDE: "-mcmodel=large"
 
 // INVALID: error: invalid argument 'lager' to -mcmodel=
+
+// AARCH64-MEDIUM: error: invalid argument 'medium' to -mcmodel=
+// AARCH64-KERNEL: error: invalid argument 'kernel' to -mcmodel=
Index: clang/lib/Driver/ToolChains/Clang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Clang.cpp
+++ clang/lib/Driver/ToolChains/Clang.cpp
@@ -5421,6 +5421,9 @@
         CM == "tiny") {
       if (Triple.isOSAIX() && CM == "medium")
         CmdArgs.push_back("-mcmodel=large");
+      else if (Triple.isAArch64() && (CM == "kernel" || CM == "medium"))
+        D.Diag(diag::err_drv_invalid_argument_to_option)
+            << CM << A->getOption().getName();
       else
         A->render(Args, CmdArgs);
     } else {

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits