sed the generated enum yytokentype and yyguts_t

to avoid LTO -Wodr warnings. yacc and flex don't support -P for these yet.
diffblue · Oct 31, 2024 · 2a37324 · 2a37324
1 parent dad7750
commit 2a37324
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -245,6 +245,8 @@ else()
   message(STATUS "IPO / LTO not supported: <${error}>")
 endif()
 
+find_program(SED sed gsed)
+
 add_subdirectory(src)
 add_subdirectory(regression)
 add_subdirectory(unit)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -39,10 +39,15 @@ macro(generic_bison name)
         COMPILE_FLAGS "${bison_warnings_as_errors} -pyy${name}"
     )
     set(renamed_parser_header "${CMAKE_CURRENT_BINARY_DIR}/${bison_header}")
-    add_custom_command(OUTPUT "${renamed_parser_header}"
-        COMMAND "${CMAKE_COMMAND}" -E copy "${BISON_parser_OUTPUT_HEADER}" "${renamed_parser_header}"
-        MAIN_DEPENDENCY "${BISON_parser_OUTPUT_HEADER}"
-    )
+    if(${SED} STREQUAL "SED-NOTFOUND")
+      add_custom_command(OUTPUT "${renamed_parser_header}"
+          COMMAND "${CMAKE_COMMAND}" -E copy "${BISON_parser_OUTPUT_HEADER}" "${renamed_parser_header}"
+          MAIN_DEPENDENCY "${BISON_parser_OUTPUT_HEADER}")
+    else()
+      add_custom_command(OUTPUT "${renamed_parser_header}"
+          COMMAND ${SED} -e "s,enum yytokentype,enum yytokentype_${name}," <${BISON_parser_OUTPUT_HEADER} >${renamed_parser_header}
+          MAIN_DEPENDENCY "${BISON_parser_OUTPUT_HEADER}")
+    endif()
     list(REMOVE_ITEM BISON_parser_OUTPUTS "${BISON_parser_OUTPUT_HEADER}")
     list(APPEND BISON_parser_OUTPUTS "${renamed_parser_header}")
 endmacro(generic_bison)
@@ -60,6 +65,18 @@ macro(generic_flex name)
         "${CMAKE_CURRENT_BINARY_DIR}/${name}_lex.yy.cpp"
         COMPILE_FLAGS "-Pyy${name}"
     )
+    set(renamed_flex_source "${CMAKE_CURRENT_BINARY_DIR}/${name}_lex.sed.yy.cpp")
+    if(${SED} STREQUAL "SED-NOTFOUND")
+      add_custom_command(OUTPUT "${renamed_flex_source}"
+          COMMAND "${CMAKE_COMMAND}" -E copy "${FLEX_scanner_OUTPUTS}" "${renamed_flex_source}"
+          MAIN_DEPENDENCY "${FLEX_scanner_OUTPUTS}")
+    else()
+      add_custom_command(OUTPUT "${renamed_flex_source}"
+          COMMAND ${SED} -e "s,struct yyguts_t,struct yy${name}guts_t," <${FLEX_scanner_OUTPUTS} >${renamed_flex_source}
+          MAIN_DEPENDENCY "${FLEX_scanner_OUTPUTS}")
+    endif()
+    list(REMOVE_ITEM FLEX_scanner_OUTPUTS "${FLEX_scanner_OUTPUTS}")
+    list(APPEND FLEX_scanner_OUTPUTS "${renamed_flex_source}")
 endmacro(generic_flex)
 
 #   Set the public include locations for a target.

diff --git a/src/ansi-c/Makefile b/src/ansi-c/Makefile
@@ -104,11 +104,15 @@ all: ansi-c$(LIBEXT)
 
 ansi_c_y.tab.cpp: parser.y
 	$(YACC) $(YFLAGS) -pyyansi_c parser.y --defines=ansi_c_y.tab.h -o $@
+	$(SED) -e's,enum yytokentype,enum yytokentype_ansi,' \
+	  <ansi_c_y.tab.h >ansi_c_y.tab.h.tmp && \
+	  mv ansi_c_y.tab.h.tmp ansi_c_y.tab.h
 
 ansi_c_y.tab.h: ansi_c_y.tab.cpp
 
 ansi_c_lex.yy.cpp: scanner.l
 	$(LEX) -Pyyansi_c -o$@ scanner.l
+	$(SED) -e's,struct yyguts_t,struct yyansiguts_t,g' <$@ >$@.tmp && mv $@.tmp $@
 
 # extra dependencies
 ansi_c_y.tab$(OBJEXT): ansi_c_y.tab.cpp ansi_c_y.tab.h

diff --git a/src/assembler/Makefile b/src/assembler/Makefile
@@ -16,6 +16,7 @@ all: assembler$(LIBEXT)
 
 assembler_lex.yy.cpp: scanner.l
 	$(LEX) -Pyyassembler -o$@ scanner.l
+	$(SED) -e's,struct yyguts_t,struct yyasmguts_t,' <$@ >$@.tmp && mv $@.tmp $@
 
 generated_files: assembler_lex.yy.cpp
 

diff --git a/src/common b/src/common
@@ -98,6 +98,9 @@ endif
 ifeq ($(origin LEX),default)
   LEX    = flex
 endif
+ifeq ($(origin SED),default)
+  SED   = sed
+endif
 
 else ifeq ($(BUILD_ENV_),Cygwin)
   # use these for Cygwin:
@@ -130,6 +133,9 @@ endif
 ifeq ($(origin LEX),default)
   LEX    = flex
 endif
+ifeq ($(origin SED),default)
+  SED   = sed
+endif
 
 
 else ifeq ($(BUILD_ENV_),MSVC)
@@ -158,6 +164,10 @@ endif
 ifeq ($(origin LEX),default)
   LEX    = win_flex
 endif
+ifeq ($(origin SED),default)
+  # on MSVC there is no lto
+  SED   = rem
+endif
 
 
 else

diff --git a/src/crangler/Makefile b/src/crangler/Makefile
@@ -27,6 +27,7 @@ all: crangler$(EXEEXT)
 
 c_lex.yy.cpp: scanner.l
 	$(LEX) -Pyyc -o$@ scanner.l
+	$(SED) -e's,struct yyguts_t,struct yycguts_t,g' <$@ >$@.tmp && mv $@.tmp $@
 
 ###############################################################################
 

diff --git a/src/json/Makefile b/src/json/Makefile
@@ -25,6 +25,7 @@ json_y.tab.h: json_y.tab.cpp
 
 json_lex.yy.cpp: scanner.l
 	$(LEX) -Pyyjson -o$@ scanner.l
+	$(SED) -e's,struct yyguts_t,struct yyjsonguts_t,g' <$@ >$@.tmp && mv $@.tmp $@
 
 generated_files: json_lex.yy.cpp json_y.tab.cpp json_y.tab.h
 

diff --git a/src/statement-list/Makefile b/src/statement-list/Makefile
@@ -31,11 +31,15 @@ all: statement-list$(LIBEXT)
 
 statement_list_y.tab.cpp: parser.y
 	$(YACC) $(YFLAGS) -pyystatement_list parser.y --defines=statement_list_y.tab.h -o $@
+	$(SED) -e's,enum yytokentype,enum yytokentype_stmt,' \
+	  <statement_list_y.tab.h >statement_list_y.tab.h.tmp && \
+	  mv statement_list_y.tab.h.tmp statement_list_y.tab.h
 
 statement_list_y.tab.h: statement_list_y.tab.cpp
 
 statement_list_lex.yy.cpp: scanner.l
 	$(LEX) -Pyystatement_list -o$@ scanner.l
+	$(SED) -e's,struct yyguts_t,struct yystmtguts_t,g' <$@ >$@.tmp && mv $@.tmp $@
 
 # extra dependencies
 statement_list_y.tab$(OBJEXT): statement_list_y.tab.cpp \

diff --git a/src/xmllang/Makefile b/src/xmllang/Makefile
@@ -27,6 +27,7 @@ xml_y.tab.h: xml_y.tab.cpp
 
 xml_lex.yy.cpp: scanner.l
 	$(LEX) -Pyyxml -o$@ scanner.l
+	$(SED) -e's,struct yyguts_t,struct yyxmlguts_t,g' <$@ >$@.tmp && mv $@.tmp $@
 
 generated_files: xml_lex.yy.cpp xml_y.tab.cpp xml_y.tab.h