[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang odk/CppunitTest_odk_checkapi.mk solenv/gbuild
Stephan Bergmann
sbergman at redhat.com
Sun Dec 21 13:06:40 PST 2014
compilerplugins/clang/literaltoboolconversion.cxx | 7 +++++--
odk/CppunitTest_odk_checkapi.mk | 2 --
solenv/gbuild/CppunitTest.mk | 1 -
solenv/gbuild/Executable.mk | 1 -
solenv/gbuild/Library.mk | 1 -
solenv/gbuild/LinkTarget.mk | 19 ++++++-------------
solenv/gbuild/StaticLibrary.mk | 1 -
7 files changed, 11 insertions(+), 21 deletions(-)
New commits:
commit 1b1c86c14adb20f3f0429e4809f8b1d3d352899e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Dec 21 22:05:46 2014 +0100
Remove unused gb_*_disable_compiler_plugins
Change-Id: Ia6395282916011d75a4fa01aa12e96d866621411
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index dd535ae7..bc1aa06 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -387,7 +387,6 @@ $(eval $(foreach method,\
set_warnings_not_errors \
set_external_code \
set_generated_cxx_suffix \
- disable_compiler_plugins \
,\
$(call gb_CppunitTest__forward_to_Linktarget,$(method))\
))
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index d45e2dc..a3767b5 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -140,7 +140,6 @@ $(eval $(foreach method,\
set_warnings_not_errors \
set_external_code \
set_generated_cxx_suffix \
- disable_compiler_plugins \
,\
$(call gb_Executable_forward_to_Linktarget,$(method))\
))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index c66b57c..fc57b37 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -225,7 +225,6 @@ $(eval $(foreach method,\
set_warnings_not_errors \
set_external_code \
set_generated_cxx_suffix \
- disable_compiler_plugins \
,\
$(call gb_Library__forward_to_Linktarget,$(method))\
))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 1859c8b..9faed8c 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -136,7 +136,7 @@ $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%) $(gb
else
$(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.c,$(true),C ,3)
- $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(T_COMPILER_PLUGINS))
+ $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS))
endif
# Note: if the *Object_dep_target does not exist it will be created by
@@ -188,7 +188,7 @@ else
$(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.cxx,$(true),CXX,3)
$(eval $(gb_CxxObject__set_pchflags))
- $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND),$<,$(call gb_CxxObject_get_dep_target,$*),$(T_COMPILER_PLUGINS))
+ $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND),$<,$(call gb_CxxObject_get_dep_target,$*),$(COMPILER_PLUGINS))
endif
ifeq ($(gb_FULLDEPS),$(true))
@@ -212,7 +212,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
$(call gb_GenCObject_get_target,%) :
$(call gb_Output_announce,$*.c,$(true),C ,3)
test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenCObject_get_source,$*)" && false)
- $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(T_COMPILER_PLUGINS))
+ $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS))
ifeq ($(gb_FULLDEPS),$(true))
$(dir $(call gb_GenCObject_get_dep_target,%)).dir :
@@ -235,7 +235,7 @@ $(call gb_GenCxxObject_get_target,%) :
$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),$(true),CXX,3)
test -f $(GEN_CXX_SOURCE) || (echo "Missing generated source file $(GEN_CXX_SOURCE)" && false)
$(eval $(gb_CxxObject__set_pchflags))
- $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND),$(GEN_CXX_SOURCE),$(call gb_GenCxxObject_get_dep_target,$*),$(T_COMPILER_PLUGINS))
+ $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND),$(GEN_CXX_SOURCE),$(call gb_GenCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS))
ifeq ($(gb_FULLDEPS),$(true))
$(dir $(call gb_GenCxxObject_get_dep_target,%)).dir :
@@ -321,7 +321,7 @@ $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDI
else
$(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.mm,$(true),OCX,3)
- $(call gb_CObject__command_pattern,$@,$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND),$<,$(call gb_ObjCxxObject_get_dep_target,$*),$(T_COMPILER_PLUGINS))
+ $(call gb_CObject__command_pattern,$@,$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND),$<,$(call gb_ObjCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS))
endif
ifeq ($(gb_FULLDEPS),$(true))
@@ -348,7 +348,7 @@ $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%
else
$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
$(call gb_Output_announce,$*.m,$(true),OCC,3)
- $(call gb_CObject__command_pattern,$@,$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND),$<,$(call gb_ObjCObject_get_dep_target,$*),$(T_COMPILER_PLUGINS))
+ $(call gb_CObject__command_pattern,$@,$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND),$<,$(call gb_ObjCObject_get_dep_target,$*),$(COMPILER_PLUGINS))
endif
ifeq ($(gb_FULLDEPS),$(true))
@@ -613,7 +613,6 @@ $(call gb_LinkTarget_get_target,$(1)) : VISIBILITY :=
$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS :=
$(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_CODE :=
$(call gb_LinkTarget_get_target,$(1)) : SOVERSIONSCRIPT :=
-$(call gb_LinkTarget_get_target,$(1)) : T_COMPILER_PLUGINS := $$(COMPILER_PLUGINS)
ifeq ($(gb_FULLDEPS),$(true))
ifeq (depcache:,$(filter depcache,$(.FEATURES)):$(gb_PARTIAL_BUILD))
@@ -1382,10 +1381,4 @@ gb_LinkTarget_CXX_SUFFIX_$(call gb_LinkTarget__get_workdir_linktargetname,$(1))
endef
-# call gb_LinkTarget_disable_compiler_plugins,linktarget
-define gb_LinkTarget_disable_compiler_plugins
-$(call gb_LinkTarget_get_target,$(1)) : T_COMPILER_PLUGINS :=
-
-endef
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index a6e0795..dc7778f 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -112,7 +112,6 @@ $(eval $(foreach method,\
set_warnings_not_errors \
set_external_code \
set_generated_cxx_suffix \
- disable_compiler_plugins \
,\
$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
))
commit 03497d2df6840c5bcc26f6e4236c8d90ce93f61b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Dec 21 22:05:18 2014 +0100
No need for CppunitTest_odk_checkapi to disable compiler plugins
Change-Id: I258a3bb0fafbea5fa41133c0f223162cc416b36b
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk
index 3c45814..d671752 100644
--- a/odk/CppunitTest_odk_checkapi.mk
+++ b/odk/CppunitTest_odk_checkapi.mk
@@ -23,8 +23,6 @@ $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,odk_checkapi,\
udkapi \
))
-$(eval $(call gb_CppunitTest_disable_compiler_plugins,odk_checkapi))
-
$(eval $(call gb_CppunitTest_add_cxxflags,odk_checkapi,\
$(gb_CXX03FLAGS) \
))
commit f266c81b2d692068d49e682f50447ef700f10fc6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Dec 21 22:00:40 2014 +0100
Don't call isIntegerConstantExpr if isValueDependent
...some paths trough clang::Expr::isIntegerConstantExpr (esp. if
non-CPlusPlus11) assert the assumption that the given expr is not
value-dependent, so it appears to be a prereq
Change-Id: Ibc5fe472ea3f91b31c8cb7f06c4b7c7f4d6831a3
diff --git a/compilerplugins/clang/literaltoboolconversion.cxx b/compilerplugins/clang/literaltoboolconversion.cxx
index b84500a..07a7e50 100644
--- a/compilerplugins/clang/literaltoboolconversion.cxx
+++ b/compilerplugins/clang/literaltoboolconversion.cxx
@@ -47,7 +47,8 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr(
return true;
}
APSInt res;
- if (sub->isIntegerConstantExpr(res, compiler.getASTContext())
+ if (!sub->isValueDependent()
+ && sub->isIntegerConstantExpr(res, compiler.getASTContext())
&& res.getLimitedValue() <= 1)
{
SourceLocation loc { sub->getLocStart() };
@@ -132,7 +133,9 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr(
expr->getLocStart())
<< expr->getCastKindName() << expr->getSubExpr()->getType()
<< expr->getType() << expr->getSourceRange();
- } else if (sub->isIntegerConstantExpr(res, compiler.getASTContext())) {
+ } else if (!sub->isValueDependent()
+ && sub->isIntegerConstantExpr(res, compiler.getASTContext()))
+ {
report(
DiagnosticsEngine::Warning,
("implicit conversion (%0) of integer constant expression of type"
More information about the Libreoffice-commits
mailing list