Skip to content

Commit e12026f

Browse files
committed
Fix previous commit on gcc 9 and 10
1 parent 7b8bfda commit e12026f

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

src/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden
2222
-Wno-comment -Wpointer-arith -Wundef
2323
ifeq ($(USEGCC),1) # GCC bug #25509 (void)__attribute__((warn_unused_result))
2424
FLAGS += -Wno-unused-result
25+
# GCC is throwing warnings like `warning: 'int __builtin_memcmp_eq(const void*, const void*, long unsigned int)' specified bound 18446744073709551615 exceeds maximum object size 9223372036854775807` in llvm's StringRef.h == seemingly because it doesn't realise the size can't be 0.
26+
FLAGS += -Wno-stringop-overflow
27+
FLAGS += -Wno-stringop-overread
2528
endif
2629
JCFLAGS += -Wold-style-definition -Wstrict-prototypes -Wc++-compat
2730

src/debuginfo.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ using namespace llvm;
4242
#include "julia_assert.h"
4343
#include "debug-registry.h"
4444

45-
#ifdef _COMPILER_GCC_
46-
// GCC is throwing warnings like `warning: 'int __builtin_memcmp_eq(const void*, const void*, long unsigned int)' specified bound 18446744073709551615 exceeds maximum object size 9223372036854775807` in llvm's StringRef.h == seemingly because it doesn't realise the size can't be 0.
47-
#pragma GCC diagnostic push
48-
#pragma GCC diagnostic ignored "-Wstringop-overread"
49-
#pragma GCC diagnostic ignored "-Wstringop-overflow"
50-
#endif
51-
5245
static JITDebugInfoRegistry *DebugRegistry = new JITDebugInfoRegistry;
5346

5447
static JITDebugInfoRegistry &getJITDebugRegistry() JL_NOTSAFEPOINT {
@@ -1651,7 +1644,3 @@ uint64_t jl_getUnwindInfo_impl(uint64_t dwAddr)
16511644
jl_unlock_profile();
16521645
return ipstart;
16531646
}
1654-
1655-
#ifdef _COMPILER_GCC_
1656-
#pragma GCC diagnostic pop
1657-
#endif

0 commit comments

Comments
 (0)