Skip to content

Commit 19c3e2f

Browse files
krishna2803krishna2803
authored
[libc] Fix all imports of src/string/memory_utils (#114939)
Fixed imports for all files *within* `libc/src/string/memory_utils`. Note: This doesn't include **all** files that need to be fixed. Fixes #86579
1 parent 3492985 commit 19c3e2f

26 files changed

+42
-27
lines changed

‎libc/src/__support/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ add_header_library(
8787
endian_internal.h
8888
macros/properties/architectures.h
8989
macros/attributes.h
90-
macros/properties/cpu_features.h
90+
macros/config.h
9191
)
9292

9393
add_header_library(

‎libc/src/__support/FPUtil/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ add_header_library(
110110
DEPENDS
111111
libc.src.__support.common
112112
libc.src.__support.FPUtil.generic.sqrt
113+
libc.src.__support.macros.properties.cpu_features
113114
)
114115

115116
add_header_library(
@@ -120,6 +121,7 @@ add_header_library(
120121
libc.src.__support.common
121122
libc.src.__support.CPP.type_traits
122123
libc.src.__support.FPUtil.generic.fma
124+
libc.src.__support.macros.properties.cpu_features
123125
FLAGS
124126
FMA_OPT
125127
)
@@ -130,6 +132,7 @@ add_header_library(
130132
multiply_add.h
131133
DEPENDS
132134
libc.src.__support.common
135+
libc.src.__support.macros.properties.cpu_features
133136
FLAGS
134137
FMA_OPT
135138
)
@@ -150,6 +153,7 @@ add_header_library(
150153
DEPENDS
151154
libc.src.__support.common
152155
libc.src.__support.macros.optimization
156+
libc.src.__support.macros.properties.cpu_features
153157
FLAGS
154158
ROUND_OPT
155159
)
@@ -161,6 +165,7 @@ add_header_library(
161165
DEPENDS
162166
libc.src.__support.common
163167
libc.src.__support.number_pair
168+
libc.src.__support.macros.properties.cpu_features
164169
.multiply_add
165170
)
166171

‎libc/src/dirent/readdir.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_SRC_DIRENT_READDIR_H
1010
#define LLVM_LIBC_SRC_DIRENT_READDIR_H
1111

12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include <dirent.h>
1414

1515
namespace LIBC_NAMESPACE_DECL {

‎libc/src/string/allocating_string_utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "src/__support/CPP/new.h"
1313
#include "src/__support/CPP/optional.h"
14-
#include "src/__support/macros/config.h"
14+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1515
#include "src/string/memory_utils/inline_memcpy.h"
1616
#include "src/string/string_utils.h"
1717

‎libc/src/string/memory_utils/aarch64/inline_bcmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_BCMP_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
1414
#include "src/string/memory_utils/op_aarch64.h"
1515
#include "src/string/memory_utils/op_generic.h"

‎libc/src/string/memory_utils/aarch64/inline_memset.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LIBC_SRC_STRING_MEMORY_UTILS_AARCH64_INLINE_MEMSET_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/string/memory_utils/op_aarch64.h"
1414
#include "src/string/memory_utils/op_generic.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/generic/builtin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_GENERIC_BUILTIN_H
1111

1212
#include "src/__support/macros/attributes.h" // LIBC_INLINE
13-
#include "src/__support/macros/config.h"
13+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1414
#include "src/string/memory_utils/utils.h" // Ptr, CPtr
1515

1616
#include <stddef.h> // size_t

‎libc/src/string/memory_utils/inline_bcmp.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_BCMP_H
1111

1212
#include "src/__support/common.h"
13-
#include "src/__support/macros/config.h"
13+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
14+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1415
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_
1516

1617
#include <stddef.h> // size_t

‎libc/src/string/memory_utils/inline_bzero.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_BZERO_H
1111

1212
#include "src/__support/common.h"
13-
#include "src/__support/macros/config.h"
13+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
14+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1415
#include "src/string/memory_utils/inline_memset.h"
1516

1617
#include <stddef.h> // size_t

‎libc/src/string/memory_utils/inline_memmem.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMEM_H
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMEM_H
1111

12-
#include "src/__support/macros/attributes.h"
13-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
13+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1414

1515
#include <stddef.h>
1616

‎libc/src/string/memory_utils/inline_memmove.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMOVE_H
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_MEMMOVE_H
1111

12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
13+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1314
#include <stddef.h> // size_t, ptrdiff_t
1415

1516
#if defined(LIBC_TARGET_ARCH_IS_X86)

‎libc/src/string/memory_utils/inline_strcmp.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRCMP_H
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRCMP_H
1111

12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
13+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1314
#include <stddef.h>
1415

1516
namespace LIBC_NAMESPACE_DECL {

‎libc/src/string/memory_utils/inline_strstr.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRSTR_H
1010
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_INLINE_STRSTR_H
1111

12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
13+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1314
#include "src/string/memory_utils/inline_memmem.h"
1415
#include "src/string/string_utils.h"
1516
#include <stddef.h>

‎libc/src/string/memory_utils/op_aarch64.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_AARCH64_H
1414
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_AARCH64_H
1515

16-
#include "src/__support/macros/config.h"
16+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
17+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1718
#include "src/__support/macros/properties/architectures.h"
1819

1920
#if defined(LIBC_TARGET_ARCH_IS_AARCH64)

‎libc/src/string/memory_utils/op_builtin.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_BUILTIN_H
1717

1818
#include "src/__support/CPP/type_traits.h"
19-
#include "src/__support/macros/config.h"
19+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
20+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
2021
#include "src/string/memory_utils/utils.h"
2122

2223
namespace LIBC_NAMESPACE_DECL {

‎libc/src/string/memory_utils/op_generic.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
#include "src/__support/CPP/type_traits.h"
2828
#include "src/__support/common.h"
2929
#include "src/__support/endian_internal.h"
30-
#include "src/__support/macros/config.h"
30+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
31+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
3132
#include "src/__support/macros/optimization.h"
3233
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT64
3334
#include "src/string/memory_utils/op_builtin.h"

‎libc/src/string/memory_utils/op_riscv.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_RISCV_H
1313
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_RISCV_H
1414

15-
#include "src/__support/macros/config.h"
15+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
16+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1617
#include "src/__support/macros/properties/architectures.h"
1718

1819
#if defined(LIBC_TARGET_ARCH_IS_ANY_RISCV)

‎libc/src/string/memory_utils/op_x86.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_X86_H
1313
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_OP_X86_H
1414

15-
#include "src/__support/macros/config.h"
15+
#include "src/__support/macros/attributes.h" // LIBC_INLINE
16+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1617
#include "src/__support/macros/properties/architectures.h"
1718

1819
#if defined(LIBC_TARGET_ARCH_IS_X86)

‎libc/src/string/memory_utils/riscv/inline_bcmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_BCMP_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
1414
#include "src/string/memory_utils/generic/aligned_access.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/riscv/inline_memcmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMCMP_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
1414
#include "src/string/memory_utils/generic/aligned_access.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/riscv/inline_memcpy.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMCPY_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
1414
#include "src/string/memory_utils/generic/aligned_access.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/riscv/inline_memmove.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMMOVE_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
1414
#include "src/string/memory_utils/generic/byte_per_byte.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/riscv/inline_memset.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LIBC_SRC_STRING_MEMORY_UTILS_RISCV_INLINE_MEMSET_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/__support/macros/properties/architectures.h" // LIBC_TARGET_ARCH_IS_RISCV64
1414
#include "src/string/memory_utils/generic/aligned_access.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "src/__support/CPP/type_traits.h"
1515
#include "src/__support/endian_internal.h"
1616
#include "src/__support/macros/attributes.h" // LIBC_INLINE
17-
#include "src/__support/macros/config.h"
17+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1818
#include "src/__support/macros/properties/architectures.h"
1919

2020
#include <stddef.h> // size_t

‎libc/src/string/memory_utils/x86_64/inline_bcmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_BCMP_H
1010

1111
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/string/memory_utils/op_generic.h"
1414
#include "src/string/memory_utils/op_x86.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

‎libc/src/string/memory_utils/x86_64/inline_memset.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#ifndef LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMSET_H
99
#define LLVM_LIBC_SRC_STRING_MEMORY_UTILS_X86_64_INLINE_MEMSET_H
1010

11-
#include "src/__support/macros/attributes.h" // LIBC_INLINE
12-
#include "src/__support/macros/config.h"
11+
#include "src/__support/macros/attributes.h" // LIBC_INLINE, LIBC_INLINE_VAR
12+
#include "src/__support/macros/config.h" // LIBC_NAMESPACE_DECL
1313
#include "src/string/memory_utils/op_generic.h"
1414
#include "src/string/memory_utils/op_x86.h"
1515
#include "src/string/memory_utils/utils.h" // Ptr, CPtr

0 commit comments

Comments
 (0)