[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang compilerplugins/Makefile-clang.mk

[Luboš Luňák (via logerrit)]

 compilerplugins/Makefile-clang.mk |    2 +-
 compilerplugins/clang/flatten.cxx |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 3e5d4ecbde512efe169536544489635f7f076fd2
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sun Oct 6 15:01:23 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun Oct 6 16:57:34 2019 +0200

    the PCH in compilerplugins should also depend on the Makefile
    
    Otherwise it may not get rebuilt in Jenkins when flags in the Makefile
    change.
    
    Change-Id: I9a06c5bbfd4af2714497c5658d8c523a6c929f68
    Reviewed-on: https://gerrit.libreoffice.org/80318
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index 1a2ceef369df..6e18ee55487a 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -306,7 +306,7 @@ LO_CLANG_ANALYZER_PCH_CXXFLAGS := -I$(BUILDDIR)/config_host -I$(CLANGDIR)/includ
     -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
 $(CLANGOUTDIR)/sharedvisitor/clang.pch: $(CLANGINDIR)/sharedvisitor/precompiled_clang.hxx \
-        $(CLANGOUTDIR)/clang-timestamp \
+        $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp \
         | $(CLANGOUTDIR)/sharedvisitor
 	$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),PCH,1)
 	$(QUIET)$(CLANGDIR)/bin/clang -x c++-header $(LO_CLANG_ANALYZER_PCH_CXXFLAGS) \
commit 1cccad3dd24e4a5cf5d7299326ae302e71980971
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Oct 5 13:27:55 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun Oct 6 16:57:23 2019 +0200

    replace throw with abort
    
    There is nothing catching the exception anyway, and this fails
    to compile if compiling the plugin with Clang's CXXFLAGS (which
    include -fno-exceptions).
    
    Change-Id: Iad9316ad9613e4fd66d0e5a16fd71bbb8066cc2b
    Reviewed-on: https://gerrit.libreoffice.org/80299
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/compilerplugins/clang/flatten.cxx b/compilerplugins/clang/flatten.cxx
index e56d21603774..81f897cb0ee3 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -474,7 +474,10 @@ std::string stripOpenAndCloseBrace(std::string s)
 {
     size_t i = s.find("{");
     if (i == std::string::npos)
-        throw "did not find {";
+    {
+        assert( !"did not find {" );
+        abort();
+    }
 
     ++i;
     // strip to line end
@@ -486,7 +489,10 @@ std::string stripOpenAndCloseBrace(std::string s)
 
     i = s.rfind("}");
     if (i == std::string::npos)
-        throw "did not find }";
+    {
+        assert( !"did not find }" );
+        abort();
+    }
     --i;
     while (s[i] == ' ')
         --i;