diff options
| author | Chad Rosier <mcrosier@apple.com> | 2013-03-26 18:01:48 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2013-03-26 18:01:48 +0000 |
| commit | e2359e21320f39b167b31afb0c281419361faa51 (patch) | |
| tree | a8bbd97d2f7cddb5b808c5fc2fac7bbb3f504610 | |
| parent | 72339a0d160720c6301d629761e701e5fad56f5e (diff) | |
Fix a crasher by reporting a fatal error if we're unable to create the target
machine and one is required.
Part of rdar://13295753
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178042 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticFrontendKinds.td | 2 | ||||
| -rw-r--r-- | lib/CodeGen/BackendUtil.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/clang/Basic/DiagnosticFrontendKinds.td b/include/clang/Basic/DiagnosticFrontendKinds.td index 111622e0fe..29822683ed 100644 --- a/include/clang/Basic/DiagnosticFrontendKinds.td +++ b/include/clang/Basic/DiagnosticFrontendKinds.td @@ -42,8 +42,6 @@ def err_fe_unable_to_load_pch : Error< "unable to load PCH file">; def err_fe_unable_to_load_plugin : Error< "unable to load plugin '%0': '%1'">; -def err_fe_unable_to_create_target : Error< - "unable to create target: '%0'">; def err_fe_unable_to_interface_with_target : Error< "unable to interface with target machine">; def err_fe_unable_to_open_output : Error< diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index 952d1fb15d..1d7395915b 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -329,7 +329,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) { const llvm::Target *TheTarget = TargetRegistry::lookupTarget(Triple, Error); if (!TheTarget) { if (MustCreateTM) - Diags.Report(diag::err_fe_unable_to_create_target) << Error; + llvm::report_fatal_error ("Unable to create target: " + Error); return 0; } |