comphelper/qa/unit/variadictemplates.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 86d2d8e03763e97a067b1dca8cb8d9829064abdc
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 3 12:43:40 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 3 18:32:39 2024 +0200

    try to work around clang compiler crash on macos
    
    clang::CodeGen::CodeGenFunction::EmitAggregateStore(llvm::Value*,
    clang::CodeGen::Address, bool)
    (anonymous
    namespace)::AggExprEmitter::VisitConstantExpr(clang::ConstantExpr*)
    (anonymous namespace)::AggExprEmitter::VisitCastExpr(clang::CastExpr*)
    clang::CodeGen::CodeGenFunction::EmitAggExpr(clang::Expr const*,
    clang::CodeGen::AggValueSlot)
    clang::CodeGen::CodeGenFunction::EmitIgnoredExpr(clang::Expr const*)
    clang::CodeGen::CodeGenFunction::EmitStmt(clang::Stmt const*,
    llvm::ArrayRef<clang::Attr const*>)
    
clang::CodeGen::CodeGenFunction::EmitCompoundStmtWithoutScope(clang::CompoundStmt
    const&, bool, clang::CodeGen::AggValueSlot)
    clang::CodeGen::CodeGenFunction::GenerateCode(clang::GlobalDecl,
    llvm::Function*, clang::CodeGen::CGFunctionInfo const&)
    
clang::CodeGen::CodeGenModule::EmitGlobalFunctionDefinition(clang::GlobalDecl,
    llvm::GlobalValue*)
    
    Change-Id: I96ef1d95a46542d2dfa85f5c6dbfa2ec05b41302
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167045
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/comphelper/qa/unit/variadictemplates.cxx 
b/comphelper/qa/unit/variadictemplates.cxx
index 48ed59faab78..0ab7cb757669 100644
--- a/comphelper/qa/unit/variadictemplates.cxx
+++ b/comphelper/qa/unit/variadictemplates.cxx
@@ -23,10 +23,16 @@ public:
     void testUnwrapArgs();
 
     CPPUNIT_TEST_SUITE(VariadicTemplatesTest);
+// This unit test sometimes generates a compiler crash on macos Intel. 
Unfortunately the crash
+// is sometimes in the codegen phase, so its not obvious how to fix it.
+#if !(defined(MACOSX) && defined __x86_64__ && __clang_major__ <= 14)
     CPPUNIT_TEST(testUnwrapArgs);
+#endif
     CPPUNIT_TEST_SUITE_END();
 };
 
+#if !(defined(MACOSX) && defined __x86_64__ && __clang_major__ <= 14)
+
 namespace {
 
 namespace detail {
@@ -171,9 +177,11 @@ void VariadicTemplatesTest::testUnwrapArgs() {
         }
     }
 }
+#endif
 
 CPPUNIT_TEST_SUITE_REGISTRATION(VariadicTemplatesTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

Reply via email to