Merge pull request #23563 from JuliaLang/yyc/build/assert

Makes sure assertion respects JL_NDEBUG in C++ code

Author: Keno

src/APInt-C.cpp

@@ -6,10 +6,9 @@
 #include <llvm/ADT/APFloat.h>
 #include <llvm/Support/MathExtras.h>
 
-#include "fix_llvm_assert.h"
-
 #include "APInt-C.h"
 #include "julia.h"
+#include "julia_assert.h"
 
 using namespace llvm;
 

src/Makefile

@@ -75,8 +75,8 @@ LLVM_LIBS := support
 endif
 
 # headers are used for dependency tracking, while public headers will be part of the dist
-HEADERS := $(BUILDDIR)/julia_version.h $(wildcard $(SRCDIR)/support/*.h) $(addprefix $(SRCDIR)/,julia.h julia_threads.h tls.h locks.h atomics.h julia_internal.h options.h timing.h)
-PUBLIC_HEADERS := $(BUILDDIR)/julia_version.h $(wildcard $(SRCDIR)/support/*.h) $(addprefix $(SRCDIR)/,julia.h julia_threads.h tls.h locks.h atomics.h)
+HEADERS := $(BUILDDIR)/julia_version.h $(wildcard $(SRCDIR)/support/*.h) $(addprefix $(SRCDIR)/,julia.h julia_assert.h julia_threads.h tls.h locks.h atomics.h julia_internal.h options.h timing.h)
+PUBLIC_HEADERS := $(BUILDDIR)/julia_version.h $(wildcard $(SRCDIR)/support/*.h) $(addprefix $(SRCDIR)/,julia.h julia_assert.h julia_threads.h tls.h locks.h atomics.h)
 ifeq ($(USE_SYSTEM_LIBUV),0)
 ifeq ($(OS),WINNT)
 HEADERS += $(build_includedir)/tree.h

src/array.c

@@ -5,12 +5,12 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #ifdef _OS_WINDOWS_
 #include <malloc.h>
 #endif
 #include "julia.h"
 #include "julia_internal.h"
+#include "julia_assert.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -157,7 +157,7 @@ jl_array_t *jl_new_array_for_deserialization(jl_value_t *atype, uint32_t ndims,
     return _new_array_(atype, ndims, dims, isunboxed, elsz);
 }
 
-#ifndef NDEBUG
+#ifndef JL_NDEBUG
 static inline int is_ntuple_long(jl_value_t *v)
 {
     if (!jl_is_tuple(v))

src/ast.c

@@ -7,13 +7,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #ifdef _OS_WINDOWS_
 #include <malloc.h>
 #endif
 #include "julia.h"
 #include "julia_internal.h"
 #include "flisp.h"
+#include "julia_assert.h"
 
 #ifdef __cplusplus
 extern "C" {

src/builtins.c

@@ -10,7 +10,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <setjmp.h>
-#include <assert.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -25,6 +24,7 @@
 #include "julia_internal.h"
 #include "builtin_proto.h"
 #include "intrinsics.h"
+#include "julia_assert.h"
 
 #ifdef __cplusplus
 extern "C" {

src/cgmemmgr.cpp

@@ -5,7 +5,6 @@
 #include "options.h"
 
 #include <llvm/ExecutionEngine/SectionMemoryManager.h>
-#include "fix_llvm_assert.h"
 #include "julia.h"
 #include "julia_internal.h"
 
@@ -25,6 +24,7 @@
 #ifdef _OS_FREEBSD_
 #  include <sys/types.h>
 #endif
+#include "julia_assert.h"
 
 namespace {
 

src/codegen.cpp

@@ -31,7 +31,6 @@
 #include <vector>
 #include <set>
 #include <cstdio>
-#include <cassert>
 #include <iostream>
 #include <functional>
 
@@ -85,7 +84,6 @@
 #include <polly/ScopDetection.h>
 #endif
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
-#include "fix_llvm_assert.h"
 
 using namespace llvm;
 namespace llvm {
@@ -100,6 +98,7 @@ namespace llvm {
 #include "julia_internal.h"
 #include "jitlayers.h"
 #include "codegen_shared.h"
+#include "julia_assert.h"
 
 // LLVM version compatibility macros
 legacy::PassManager *jl_globalPM;

src/datatype.c

@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <assert.h>
 #include "julia.h"
 #include "julia_internal.h"
+#include "julia_assert.h"
 
 #ifdef __cplusplus
 extern "C" {

src/debuginfo.cpp

@@ -22,7 +22,6 @@
 #include <llvm/Object/MachO.h>
 #include <llvm/Object/COFF.h>
 #include <llvm/Object/ELFObjectFile.h>
-#include "fix_llvm_assert.h"
 
 using namespace llvm;
 
@@ -46,7 +45,7 @@ using llvm_file_magic = sys::fs::file_magic;
 #include <vector>
 #include <set>
 #include <cstdio>
-#include <cassert>
+#include "julia_assert.h"
 
 typedef object::SymbolRef SymRef;
 

src/disasm.cpp

@@ -69,13 +69,13 @@
 #include <llvm/IR/Module.h>
 #include <llvm/IR/IntrinsicInst.h>
 #include "llvm/IR/AssemblyAnnotationWriter.h"
-#include "fix_llvm_assert.h"
 
 #include "julia.h"
 #include "julia_internal.h"
 
 using namespace llvm;
 #include "debuginfo.h"
+#include "julia_assert.h"
 
 // helper class for tracking inlining context while printing debug info
 class DILineInfoPrinter {