Skip to content

Commit c6aa834

Browse files
committed
Turn anonymous type in anonymous union warning back on after cleaning up
issues. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@177136 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent a286fc0 commit c6aa834

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

Makefile.config.in

-2
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,6 @@ COVERED_SWITCH_DEFAULT = @COVERED_SWITCH_DEFAULT@
375375
NO_UNINITIALIZED = @NO_UNINITIALIZED@
376376
# -Wno-maybe-uninitialized
377377
NO_MAYBE_UNINITIALIZED = @NO_MAYBE_UNINITIALIZED@
378-
# -Wno-nested-anon-types
379-
NO_NESTED_ANON_TYPES = @NO_NESTED_ANON_TYPES@
380378

381379
# Was polly found in tools/polly?
382380
LLVM_HAS_POLLY = @LLVM_HAS_POLLY@

Makefile.rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ LD.Flags += $(EXTRA_LD_OPTIONS)
667667
endif
668668

669669
ifndef NO_PEDANTIC
670-
CompileCommonOpts += -pedantic -Wno-long-long $(NO_NESTED_ANON_TYPES)
670+
CompileCommonOpts += -pedantic -Wno-long-long
671671
endif
672672
CompileCommonOpts += -Wall -W -Wno-unused-parameter -Wwrite-strings \
673673
$(EXTRA_OPTIONS) $(COVERED_SWITCH_DEFAULT) \

autoconf/configure.ac

+1-2
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,6 @@ dnl Check optional compiler flags.
12701270
AC_MSG_CHECKING([optional compiler flags])
12711271
CXX_FLAG_CHECK(NO_VARIADIC_MACROS, [-Wno-variadic-macros])
12721272
CXX_FLAG_CHECK(NO_MISSING_FIELD_INITIALIZERS, [-Wno-missing-field-initializers])
1273-
CXX_FLAG_CHECK(NO_NESTED_ANON_TYPES, [-Wno-nested-anon-types])
12741273
CXX_FLAG_CHECK(COVERED_SWITCH_DEFAULT, [-Wcovered-switch-default])
12751274

12761275
dnl GCC's potential uninitialized use analysis is weak and presents lots of
@@ -1288,7 +1287,7 @@ then
12881287
CXX_FLAG_CHECK(NO_UNINITIALIZED, [-Wno-uninitialized])
12891288
fi
12901289
fi
1291-
AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $NO_NESTED_ANON_TYPES $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED])
1290+
AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED])
12921291

12931292
AC_ARG_WITH([python],
12941293
[AS_HELP_STRING([--with-python], [path to python])],

cmake/modules/HandleLLVMOptions.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE )
202202

203203
if (LLVM_ENABLE_PEDANTIC)
204204
add_llvm_definitions( -pedantic -Wno-long-long )
205-
check_cxx_compiler_flag("-Werror -Wnested-anon-types" CXX_SUPPORTS_NO_NESTED_ANON_TYPES_FLAG)
206-
append_if(CMAKE_CXX_FLAGS "-Wno-nested-anon-types" CXX_SUPPORTS_NO_NESTED_ANON_TYPES_FLAG)
207205
endif (LLVM_ENABLE_PEDANTIC)
208206
check_cxx_compiler_flag("-Werror -Wcovered-switch-default" CXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG)
209207
append_if(CMAKE_CXX_FLAGS "-Wcovered-switch-default" CXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG)

configure

+5-9
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,6 @@ CONVENIENCE_LTDL_FALSE
766766
LIBADD_DL
767767
NO_VARIADIC_MACROS
768768
NO_MISSING_FIELD_INITIALIZERS
769-
NO_NESTED_ANON_TYPES
770769
COVERED_SWITCH_DEFAULT
771770
NO_MAYBE_UNINITIALIZED
772771
NO_UNINITIALIZED
@@ -10498,7 +10497,7 @@ else
1049810497
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1049910498
lt_status=$lt_dlunknown
1050010499
cat > conftest.$ac_ext <<EOF
10501-
#line 10501 "configure"
10500+
#line 10500 "configure"
1050210501
#include "confdefs.h"
1050310502

1050410503
#if HAVE_DLFCN_H
@@ -12265,8 +12264,6 @@ NO_VARIADIC_MACROS=`$CXX -Werror -Wvariadic-macros -fsyntax-only -xc /dev/null 2
1226512264

1226612265
NO_MISSING_FIELD_INITIALIZERS=`$CXX -Werror -Wmissing-field-initializers -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-missing-field-initializers`
1226712266

12268-
NO_NESTED_ANON_TYPES=`$CXX -Werror -Wnested-anon-types -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-nested-anon-types`
12269-
1227012267
COVERED_SWITCH_DEFAULT=`$CXX -Werror -Wcovered-switch-default -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wcovered-switch-default`
1227112268

1227212269

@@ -12282,8 +12279,8 @@ then
1228212279

1228312280
fi
1228412281
fi
12285-
{ echo "$as_me:$LINENO: result: $NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $NO_NESTED_ANON_TYPES $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&5
12286-
echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $NO_NESTED_ANON_TYPES $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
12282+
{ echo "$as_me:$LINENO: result: $NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&5
12283+
echo "${ECHO_T}$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS $COVERED_SWITCH_DEFAULT $NO_UNINITIALIZED $NO_MAYBE_UNINITIALIZED" >&6; }
1228712284

1228812285

1228912286
# Check whether --with-python was given.
@@ -22585,7 +22582,6 @@ CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
2258522582
LIBADD_DL!$LIBADD_DL$ac_delim
2258622583
NO_VARIADIC_MACROS!$NO_VARIADIC_MACROS$ac_delim
2258722584
NO_MISSING_FIELD_INITIALIZERS!$NO_MISSING_FIELD_INITIALIZERS$ac_delim
22588-
NO_NESTED_ANON_TYPES!$NO_NESTED_ANON_TYPES$ac_delim
2258922585
COVERED_SWITCH_DEFAULT!$COVERED_SWITCH_DEFAULT$ac_delim
2259022586
NO_MAYBE_UNINITIALIZED!$NO_MAYBE_UNINITIALIZED$ac_delim
2259122587
NO_UNINITIALIZED!$NO_UNINITIALIZED$ac_delim
@@ -22615,6 +22611,7 @@ BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
2261522611
ALL_BINDINGS!$ALL_BINDINGS$ac_delim
2261622612
OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
2261722613
ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
22614+
RPATH!$RPATH$ac_delim
2261822615
_ACEOF
2261922616

2262022617
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22656,14 +22653,13 @@ _ACEOF
2265622653
ac_delim='%!_!# '
2265722654
for ac_last_try in false false false false false :; do
2265822655
cat >conf$$subs.sed <<_ACEOF
22659-
RPATH!$RPATH$ac_delim
2266022656
RDYNAMIC!$RDYNAMIC$ac_delim
2266122657
program_prefix!$program_prefix$ac_delim
2266222658
LIBOBJS!$LIBOBJS$ac_delim
2266322659
LTLIBOBJS!$LTLIBOBJS$ac_delim
2266422660
_ACEOF
2266522661

22666-
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
22662+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
2266722663
break
2266822664
elif $ac_last_try; then
2266922665
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

0 commit comments

Comments
 (0)