-
Notifications
You must be signed in to change notification settings - Fork 13.6k
Add a super simple wrapper for a merged string table. #119488
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
//===- StringTable.h - Table of strings tracked by offset ----------C++ -*-===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#ifndef LLVM_ADT_STRING_TABLE_H | ||
#define LLVM_ADT_STRING_TABLE_H | ||
|
||
#include "llvm/ADT/StringRef.h" | ||
#include <limits> | ||
|
||
namespace llvm { | ||
|
||
/// A table of densely packed, null-terminated strings indexed by offset. | ||
/// | ||
/// This table abstracts a densely concatenated list of null-terminated strings, | ||
/// each of which can be referenced using an offset into the table. | ||
/// | ||
/// This requires and ensures that the string at offset 0 is also the empty | ||
/// string. This helps allow zero-initialized offsets form empty strings and | ||
/// avoids non-zero initialization when using a string literal pointer would | ||
/// allow a null pointer. | ||
/// | ||
/// The primary use case is having a single global string literal for the table | ||
/// contents, and offsets into it in other global data structures to avoid | ||
/// dynamic relocations of individual string literal pointers in those global | ||
/// data structures. | ||
class StringTable { | ||
StringRef Table; | ||
|
||
public: | ||
// An offset into one of these packed string tables, used to select a string | ||
// within the table. | ||
// | ||
// Typically these are created by TableGen or other code generator from | ||
// computed offsets, and it just wraps that integer into a type until it is | ||
// used with the relevant table. | ||
// | ||
// We also ensure that the empty string is at offset zero and default | ||
// constructing this class gives you an offset of zero. This makes default | ||
// constructing this type work similarly (after indexing the table) to default | ||
// constructing a `StringRef`. | ||
class Offset { | ||
// Note that we ensure the empty string is at offset zero. | ||
unsigned Value = 0; | ||
|
||
public: | ||
constexpr Offset() = default; | ||
constexpr Offset(unsigned Value) : Value(Value) {} | ||
|
||
constexpr unsigned value() const { return Value; } | ||
}; | ||
|
||
// We directly handle string literals with a templated converting constructor | ||
// because we *don't* want to do `strlen` on them -- we fully expect null | ||
// bytes in this input. This is somewhat the opposite of how `StringLiteral` | ||
// works. | ||
template <size_t N> | ||
constexpr StringTable(const char (&RawTable)[N]) : Table(RawTable, N) { | ||
static_assert(N <= std::numeric_limits<unsigned>::max(), | ||
"We only support table sizes that can be indexed by an " | ||
"`unsigned` offset."); | ||
|
||
// Note that we can only use `empty`, `data`, and `size` in these asserts to | ||
// support `constexpr`. | ||
assert(!Table.empty() && "Requires at least a valid empty string."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are assertions safe in a constexpr-context? It would also be reasonable to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep, as long as they don't fire. That said, these weren't because Also added the static assert, seems nice. |
||
assert(Table.data()[0] == '\0' && "Offset zero must be the empty string."); | ||
// Ensure that `strlen` from any offset cannot overflow the end of the table | ||
// by insisting on a null byte at the end. | ||
assert(Table.data()[Table.size() - 1] == '\0' && | ||
"Last byte must be a null byte."); | ||
} | ||
|
||
// Get a string from the table starting with the provided offset. The returned | ||
// `StringRef` is in fact null terminated, and so can be converted safely to a | ||
// C-string if necessary for a system API. | ||
constexpr StringRef operator[](Offset O) const { | ||
assert(O.value() < Table.size() && "Out of bounds offset!"); | ||
return Table.data() + O.value(); | ||
} | ||
Comment on lines
+80
to
+83
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wonder if it's worth asserting that the byte just before |
||
|
||
/// Returns the byte size of the table. | ||
constexpr size_t size() const { return Table.size(); } | ||
}; | ||
|
||
} // namespace llvm | ||
|
||
#endif // LLVM_ADT_STRING_TABLE_H |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
//===- llvm/unittest/ADT/StringTableTest.cpp - StringTable tests ----------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include "llvm/ADT/StringTable.h" | ||
#include "gmock/gmock.h" | ||
#include "gtest/gtest.h" | ||
#include <cstdlib> | ||
|
||
using namespace llvm; | ||
|
||
namespace { | ||
|
||
using ::testing::Eq; | ||
using ::testing::StrEq; | ||
|
||
TEST(StringTableTest, Basic) { | ||
static constexpr char InputTable[] = "\0test\0"; | ||
constexpr StringTable T = InputTable; | ||
|
||
// We support some limited constexpr operations, check those first. | ||
static_assert(T.size() == sizeof(InputTable)); | ||
static_assert(T[0].empty()); | ||
static_assert(T[StringTable::Offset()].empty()); | ||
static_assert(T[1].size() == 4); | ||
|
||
// And use normal Google Test runtime assertions to check the contents and | ||
// give more complete error messages. | ||
EXPECT_THAT(T[0], Eq("")); | ||
EXPECT_THAT(T[StringTable::Offset()], Eq("")); | ||
EXPECT_THAT(T[1], Eq("test")); | ||
|
||
// Also check that this is a valid C-string. | ||
EXPECT_THAT(T[1].data(), StrEq("test")); | ||
} | ||
|
||
} // anonymous namespace |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bikeshedding nit: I tend to prefer non-nested classes but I don't feel strongly about it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fine either way TBH... But I didn't have a better name than
StringTableOffset
, and at that point it seemed like it should be nested.If you have a name suggestion, happy to move it out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would go for StrTabOffset, but I'm more comfortable with consonant cluster mush than most people.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I think I'll leave this as
StringTable::Offset
for now. =DThanks again, will merge once other things are fixed, and start working on PRs to switch over.