This is an archive of the discontinued LLVM Phabricator instance.

Differential D65822

Detect HAVE_SYS_TYPES_H in lldb
ClosedPublic

Authored by hhb on Aug 6 2019, 12:20 PM.

Details

Reviewers
labath
Commits
rGc6551bf01333: Detect HAVE_SYS_TYPES_H in lldb
rLLDB368125: Detect HAVE_SYS_TYPES_H in lldb
rL368125: Detect HAVE_SYS_TYPES_H in lldb
Summary

After rL368069 I noticed that HAVE_SYS_TYPES_H is not defined in
Platform.h, or anywhere else in lldb. This change fixes that.

Diff Detail

Event Timeline

hhb created this revision.Aug 6 2019, 12:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2019, 12:20 PM
Herald added subscribers: lldb-commits, mgorny. · View Herald Transcript
Harbormaster completed remote builds in B36255: Diff 213686.Aug 6 2019, 12:20 PM
hhb updated this revision to Diff 213687.Aug 6 2019, 12:21 PM

Remove a test code.

hhb updated this revision to Diff 213688.Aug 6 2019, 12:23 PM

Remove test code

hhb added a comment.Aug 6 2019, 12:24 PM

I'm not really know how this works before, given no one includes Config.h. Or maybe sys/types.h is never needed?

Harbormaster completed remote builds in B36256: Diff 213687.Aug 6 2019, 12:26 PM
Harbormaster completed remote builds in B36257: Diff 213688.
hhb updated this revision to Diff 213689.Aug 6 2019, 12:29 PM

Add one more place

Herald added a subscriber: mstorsjo. · View Herald TranscriptAug 6 2019, 12:29 PM
Harbormaster completed remote builds in B36258: Diff 213689.Aug 6 2019, 12:29 PM
srhines added a subscriber: srhines.Aug 6 2019, 12:43 PM
srhines added inline comments.
lldb/include/lldb/Host/windows/PosixApi.h
56 ↗(On Diff #213689)

Update comment.

hhb updated this revision to Diff 213726.Aug 6 2019, 2:44 PM

Fix comment.

hhb marked an inline comment as done.Aug 6 2019, 2:44 PM
Harbormaster completed remote builds in B36271: Diff 213726.Aug 6 2019, 2:45 PM
labath accepted this revision.Aug 6 2019, 11:08 PM

Woops, this is quite embarrassing. :/

One day we should audit these to check which of these files really needs to include this header, but since there are at least some files that definitely need it, adding the cmake check is the right way to go...

This revision is now accepted and ready to land.Aug 6 2019, 11:08 PM
Closed by commit rL368125: Detect HAVE_SYS_TYPES_H in lldb (authored by hhb). · Explain WhyAug 6 2019, 11:15 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2019, 11:15 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
cmake/
modules/
1 line
include/
lldb/
Host/
2 lines
source/
Expression/
2 lines
2 lines
Plugins/
ExpressionParser/
Clang/
2 lines
2 lines
tools/
driver/
2 lines

Diff 213688

lldb/cmake/modules/LLDBGenerateConfig.cmake

# This file contains all the logic for running configure-time checks # This file contains all the logic for running configure-time checks
include(CheckSymbolExists) include(CheckSymbolExists)
include(CheckIncludeFile) include(CheckIncludeFile)
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckLibraryExists) include(CheckLibraryExists)
set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
check_symbol_exists(ppoll poll.h HAVE_PPOLL) check_symbol_exists(ppoll poll.h HAVE_PPOLL)
set(CMAKE_REQUIRED_DEFINITIONS) set(CMAKE_REQUIRED_DEFINITIONS)
check_symbol_exists(sigaction signal.h HAVE_SIGACTION) check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
check_cxx_symbol_exists(accept4 "sys/socket.h" HAVE_ACCEPT4) check_cxx_symbol_exists(accept4 "sys/socket.h" HAVE_ACCEPT4)
check_include_file(termios.h HAVE_TERMIOS_H) check_include_file(termios.h HAVE_TERMIOS_H)
check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
check_include_files("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H) check_include_files("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
check_cxx_symbol_exists(process_vm_readv "sys/uio.h" HAVE_PROCESS_VM_READV) check_cxx_symbol_exists(process_vm_readv "sys/uio.h" HAVE_PROCESS_VM_READV)
check_cxx_symbol_exists(__NR_process_vm_readv "sys/syscall.h" HAVE_NR_PROCESS_VM_READV) check_cxx_symbol_exists(__NR_process_vm_readv "sys/syscall.h" HAVE_NR_PROCESS_VM_READV)
check_library_exists(compression compression_encode_buffer "" HAVE_LIBCOMPRESSION) check_library_exists(compression compression_encode_buffer "" HAVE_LIBCOMPRESSION)
# These checks exist in LLVM's configuration, so I want to match the LLVM names # These checks exist in LLVM's configuration, so I want to match the LLVM names
Show All 20 Lines

lldb/include/lldb/Host/Config.h.cmake

Show All 13 Lines
#cmakedefine01 LLDB_EDITLINE_USE_WCHAR #cmakedefine01 LLDB_EDITLINE_USE_WCHAR
#cmakedefine01 LLDB_HAVE_EL_RFUNC_T #cmakedefine01 LLDB_HAVE_EL_RFUNC_T
#cmakedefine LLDB_DISABLE_POSIX #cmakedefine LLDB_DISABLE_POSIX
#define LLDB_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" #define LLDB_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}"
#cmakedefine01 HAVE_SYS_TYPES_H
#cmakedefine01 HAVE_SYS_EVENT_H #cmakedefine01 HAVE_SYS_EVENT_H
#cmakedefine01 HAVE_PPOLL #cmakedefine01 HAVE_PPOLL
#cmakedefine01 HAVE_SIGACTION #cmakedefine01 HAVE_SIGACTION
#cmakedefine01 HAVE_PROCESS_VM_READV #cmakedefine01 HAVE_PROCESS_VM_READV
#cmakedefine01 HAVE_NR_PROCESS_VM_READV #cmakedefine01 HAVE_NR_PROCESS_VM_READV
#ifndef HAVE_LIBCOMPRESSION #ifndef HAVE_LIBCOMPRESSION
#cmakedefine HAVE_LIBCOMPRESSION #cmakedefine HAVE_LIBCOMPRESSION
#endif #endif
#endif // #ifndef LLDB_HOST_CONFIG_H #endif // #ifndef LLDB_HOST_CONFIG_H

lldb/source/Expression/UserExpression.cpp

//===-- UserExpression.cpp ---------------------------------*- C++ -*-===// //===-- UserExpression.cpp ---------------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "lldb/Host/Config.h"
#include <stdio.h> #include <stdio.h>
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <string> #include <string>
▲ Show 20 Lines • Show All 385 Lines • Show Last 20 Lines

lldb/source/Expression/UtilityFunction.cpp

//===-- UtilityFunction.cpp -------------------------------------*- C++ -*-===// //===-- UtilityFunction.cpp -------------------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "lldb/Host/Config.h"
#include <stdio.h> #include <stdio.h>
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include "lldb/Core/Module.h" #include "lldb/Core/Module.h"
#include "lldb/Core/StreamFile.h" #include "lldb/Core/StreamFile.h"
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp

//===-- ClangUserExpression.cpp ---------------------------------*- C++ -*-===// //===-- ClangUserExpression.cpp ---------------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "lldb/Host/Config.h"
#include <stdio.h> #include <stdio.h>
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include <string> #include <string>
▲ Show 20 Lines • Show All 881 Lines • Show Last 20 Lines

lldb/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp

//===-- ClangUtilityFunction.cpp ---------------------------------*- C++-*-===// //===-- ClangUtilityFunction.cpp ---------------------------------*- C++-*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "lldb/Host/Config.h"
#include "ClangUtilityFunction.h" #include "ClangUtilityFunction.h"
#include "ClangExpressionDeclMap.h" #include "ClangExpressionDeclMap.h"
#include "ClangExpressionParser.h" #include "ClangExpressionParser.h"
#include "ClangExpressionSourceCode.h" #include "ClangExpressionSourceCode.h"
#include <stdio.h> #include <stdio.h>
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
▲ Show 20 Lines • Show All 145 Lines • Show Last 20 Lines

lldb/tools/driver/Platform.h

//===-- Platform.h ----------------------------------------------*- C++ -*-===// //===-- Platform.h ----------------------------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef lldb_Platform_h_ #ifndef lldb_Platform_h_
#define lldb_Platform_h_ #define lldb_Platform_h_
#include "lldb/Host/Config.h"
#if defined(_WIN32) #if defined(_WIN32)
#include <io.h> #include <io.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <signal.h> #include <signal.h>
#endif #endif
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines