This is an archive of the discontinued LLVM Phabricator instance.

Differential D138056

[libc] re-enable assert
ClosedPublic

Authored by michaelrj on Nov 15 2022, 12:07 PM.

Details

Reviewers
sivachandra
lntue
Commits
rG7ffa52dfd12b: [libc] re-enable assert
Summary

The assert functions were disabled while the signal functions were being
fixed. This patch re-enables them.

Diff Detail

Event Timeline

michaelrj created this revision.Nov 15 2022, 12:07 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptNov 15 2022, 12:07 PM
Herald added subscribers: libc-commits, ecnelises, tschuett. · View Herald Transcript
michaelrj requested review of this revision.Nov 15 2022, 12:07 PM
lntue added inline comments.Nov 15 2022, 12:33 PM
libc/test/src/CMakeLists.txt
51–52

Is this comment still correct?

sivachandra accepted this revision.Nov 15 2022, 12:42 PM

Good to land after addressing Tue's comment.

This revision is now accepted and ready to land.Nov 15 2022, 12:42 PM
Harbormaster completed remote builds in B197821: Diff 475552.Nov 15 2022, 12:46 PM
michaelrj updated this revision to Diff 475566.Nov 15 2022, 1:38 PM
michaelrj marked an inline comment as done.

remove extraneous comment

This revision was landed with ongoing or failed builds.Nov 15 2022, 1:39 PM
Closed by commit rG7ffa52dfd12b: [libc] re-enable assert (authored by michaelrj). · Explain Why
This revision was automatically updated to reflect the committed changes.
michaelrj added a commit: rG7ffa52dfd12b: [libc] re-enable assert.
Harbormaster completed remote builds in B197830: Diff 475566.Nov 15 2022, 1:46 PM

Revision Contents

PathSize
libc/
config/
linux/
x86_64/
2 lines
spec/
1 line
src/
4 lines
test/
src/
4 lines

Diff 475568

libc/config/linux/x86_64/entrypoints.txt

Show First 20 Lines • Show All 307 Lines • ▼ Show 20 Linesset(TARGET_LIBM_ENTRYPOINTS
libc.src.math.trunc libc.src.math.trunc
libc.src.math.truncf libc.src.math.truncf
libc.src.math.truncl libc.src.math.truncl
) )
if(LLVM_LIBC_FULL_BUILD) if(LLVM_LIBC_FULL_BUILD)
list(APPEND TARGET_LIBC_ENTRYPOINTS list(APPEND TARGET_LIBC_ENTRYPOINTS
# assert.h entrypoints # assert.h entrypoints
# libc.src.assert.__assert_fail libc.src.assert.__assert_fail
# dirent.h entrypoints # dirent.h entrypoints
libc.src.dirent.closedir libc.src.dirent.closedir
libc.src.dirent.dirfd libc.src.dirent.dirfd
libc.src.dirent.opendir libc.src.dirent.opendir
libc.src.dirent.readdir libc.src.dirent.readdir
# pthread.h entrypoints # pthread.h entrypoints
▲ Show 20 Lines • Show All 164 Lines • Show Last 20 Lines

libc/spec/llvm_libc_ext.td

Show All 22 Lines HeaderSpec Assert = HeaderSpec<
[], // Macros [], // Macros
[], // Types [], // Types
[], // Enumerations [], // Enumerations
[ [
FunctionSpec< FunctionSpec<
"__assert_fail", "__assert_fail",
RetValSpec<NoReturn>, RetValSpec<NoReturn>,
[ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<UnsignedType>, ArgSpec<ConstCharPtr>] [ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<UnsignedType>, ArgSpec<ConstCharPtr>]
>, >,
] ]
>; >;
HeaderSpec Sched = HeaderSpec< HeaderSpec Sched = HeaderSpec<
"sched.h", "sched.h",
[], // Macros [], // Macros
[PidT, SizeTType, CpuSetT], // Types [PidT, SizeTType, CpuSetT], // Types
Show All 16 Lines

libc/src/CMakeLists.txt

Show All 17 Linesif(${LIBC_TARGET_OS} STREQUAL "linux")
add_subdirectory(termios) add_subdirectory(termios)
add_subdirectory(unistd) add_subdirectory(unistd)
endif() endif()
if(NOT LLVM_LIBC_FULL_BUILD) if(NOT LLVM_LIBC_FULL_BUILD)
return() return()
endif() endif()
# The signal API is currently disabled as signal.h is incorrect. add_subdirectory(assert)
# since assert uses the signal API, we disable assert also.
# add_subdirectory(assert)
add_subdirectory(setjmp) add_subdirectory(setjmp)
add_subdirectory(signal) add_subdirectory(signal)
add_subdirectory(spawn) add_subdirectory(spawn)
add_subdirectory(threads) add_subdirectory(threads)
add_subdirectory(time) add_subdirectory(time)

libc/test/src/CMakeLists.txt

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Linesif(${LIBC_TARGET_OS} STREQUAL "linux")
add_subdirectory(termios) add_subdirectory(termios)
add_subdirectory(unistd) add_subdirectory(unistd)
endif() endif()
if(NOT LLVM_LIBC_FULL_BUILD) if(NOT LLVM_LIBC_FULL_BUILD)
return() return()
endif() endif()
add_subdirectory(dirent) add_subdirectory(dirent)
# The signal API is currently disabled as signal.h is incorrect. add_subdirectory(assert)
lntueUnsubmitted
Done
ReplyInline Actions

Is this comment still correct?

lntue: Is this comment still correct?
# since assert uses the signal API, we disable assert also.
# add_subdirectory(assert)
add_subdirectory(setjmp) add_subdirectory(setjmp)
add_subdirectory(signal) add_subdirectory(signal)
add_subdirectory(spawn) add_subdirectory(spawn)
add_subdirectory(time) add_subdirectory(time)
if(${LIBC_TARGET_OS} STREQUAL "linux") if(${LIBC_TARGET_OS} STREQUAL "linux")
add_subdirectory(pthread) add_subdirectory(pthread)
endif() endif()
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines