From 2309ae8a8252f29ee943cc6d8d5f0a39eb4bcf3c Mon Sep 17 00:00:00 2001 From: Manman Ren Date: Thu, 28 Jan 2016 23:29:02 +0000 Subject: [PATCH] Check for frontend errors after releasing the Builder. Frontend can emit errors when releaseing the Builder. If there are errors before or when releasing the Builder, we reset the module to stop here before invoking the backend. Before this commit, clang will continue to invoke the backend and backend can crash. Differential Revision: http://reviews.llvm.org/D16564 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@259116 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/ModuleBuilder.cpp | 9 ++++++--- test/CodeGen/target-builtin-error-3.c | 28 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 test/CodeGen/target-builtin-error-3.c diff --git a/lib/CodeGen/ModuleBuilder.cpp b/lib/CodeGen/ModuleBuilder.cpp index 9428bdf1db..234a773606 100644 --- a/lib/CodeGen/ModuleBuilder.cpp +++ b/lib/CodeGen/ModuleBuilder.cpp @@ -199,15 +199,18 @@ namespace { } void HandleTranslationUnit(ASTContext &Ctx) override { + // Release the Builder when there is no error. + if (!Diags.hasErrorOccurred() && Builder) + Builder->Release(); + + // If there are errors before or when releasing the Builder, reset + // the module to stop here before invoking the backend. if (Diags.hasErrorOccurred()) { if (Builder) Builder->clear(); M.reset(); return; } - - if (Builder) - Builder->Release(); } void AssignInheritanceModel(CXXRecordDecl *RD) override { diff --git a/test/CodeGen/target-builtin-error-3.c b/test/CodeGen/target-builtin-error-3.c new file mode 100644 index 0000000000..5beb474bef --- /dev/null +++ b/test/CodeGen/target-builtin-error-3.c @@ -0,0 +1,28 @@ +// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -S -verify -o - -target-feature +avx + +// RUN: not %clang_cc1 %s -triple=x86_64-apple-darwin -emit-obj -target-feature +avx 2> %t.err +// RUN: FileCheck < %t.err %s +// CHECK: 1 error generated + +typedef unsigned short uint16_t; +typedef long long __m128i __attribute__((__vector_size__(16))); +typedef float __v8sf __attribute__ ((__vector_size__ (32))); +typedef float __m256 __attribute__ ((__vector_size__ (32))); +typedef uint16_t half; +typedef __attribute__ ((ext_vector_type( 8),__aligned__( 16))) half half8; +typedef __attribute__ ((ext_vector_type(16),__aligned__( 32))) half half16; +typedef __attribute__ ((ext_vector_type(16),__aligned__( 2))) half half16U; +typedef __attribute__ ((ext_vector_type( 8),__aligned__( 32))) float float8; +typedef __attribute__ ((ext_vector_type(16),__aligned__( 64))) float float16; +static inline half8 __attribute__((__overloadable__)) convert_half( float8 a ) { + return __extension__ ({ __m256 __a = (a); (__m128i)__builtin_ia32_vcvtps2ph256((__v8sf)__a, (0x00)); }); // expected-error {{'__builtin_ia32_vcvtps2ph256' needs target feature f16c}} +} +static inline half16 __attribute__((__overloadable__)) convert_half( float16 a ) { + half16 r; + r.lo = convert_half( a.lo); + return r; +} +void avx_test( uint16_t *destData, float16 argbF) +{ + ((half16U*)destData)[0] = convert_half(argbF); +} -- 2.40.0