tint: Add Bitcast helper

Use this for the BlockAllocator cast.

Bug: dawn:1406
Change-Id: Ic5d1acf7f8e74037fb51fc9d5d3b5141a15bd962
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/89021
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Ben Clayton 2022-05-05 15:34:41 +00:00 committed by Dawn LUCI CQ
parent 26cba1cb39
commit 7cbd8202e6
6 changed files with 82 additions and 8 deletions

View File

@ -510,6 +510,7 @@ libtint_source_set("libtint_core_all_src") {
"transform/wrap_arrays_in_structs.h", "transform/wrap_arrays_in_structs.h",
"transform/zero_init_workgroup_memory.cc", "transform/zero_init_workgroup_memory.cc",
"transform/zero_init_workgroup_memory.h", "transform/zero_init_workgroup_memory.h",
"utils/bitcast.h",
"utils/block_allocator.h", "utils/block_allocator.h",
"utils/crc32.h", "utils/crc32.h",
"utils/debugger.cc", "utils/debugger.cc",

View File

@ -440,6 +440,7 @@ set(TINT_LIB_SRCS
sem/vector.h sem/vector.h
sem/void.cc sem/void.cc
sem/void.h sem/void.h
utils/bitcast.h
utils/block_allocator.h utils/block_allocator.h
utils/crc32.h utils/crc32.h
utils/enum_set.h utils/enum_set.h
@ -806,6 +807,7 @@ if(TINT_BUILD_TESTS)
text/unicode_test.cc text/unicode_test.cc
traits_test.cc traits_test.cc
transform/transform_test.cc transform/transform_test.cc
utils/bitcast_test.cc
utils/block_allocator_test.cc utils/block_allocator_test.cc
utils/crc32_test.cc utils/crc32_test.cc
utils/defer_test.cc utils/defer_test.cc

39
src/tint/utils/bitcast.h Normal file
View File

@ -0,0 +1,39 @@
// Copyright 2022 The Tint Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SRC_TINT_UTILS_BITCAST_H_
#define SRC_TINT_UTILS_BITCAST_H_
#include <cstring>
namespace tint::utils {
/// Bitcast performs a cast of `from` to the `TO` type using a memcpy.
/// This unsafe cast avoids triggering Clang's Control Flow Integrity checks.
/// See: crbug.com/dawn/1406
/// See: https://clang.llvm.org/docs/ControlFlowIntegrity.html#bad-cast-checking
/// @param from the value to cast
/// @tparam TO the value to cast to
/// @returns the cast value
template <typename TO, typename FROM>
inline TO Bitcast(FROM&& from) {
static_assert(sizeof(FROM) == sizeof(TO));
TO to;
memcpy(&to, &from, sizeof(TO));
return to;
}
} // namespace tint::utils
#endif // SRC_TINT_UTILS_BITCAST_H_

View File

@ -0,0 +1,37 @@
// Copyright 2022 The Tint Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/tint/utils/bitcast.h"
#include <stdint.h>
#include "gtest/gtest.h"
namespace tint::utils {
namespace {
TEST(Bitcast, Integer) {
uint32_t a = 123;
int32_t b = Bitcast<int32_t>(a);
EXPECT_EQ(a, static_cast<uint32_t>(b));
}
TEST(Bitcast, Pointer) {
uint32_t a = 123;
void* b = Bitcast<void*>(&a);
EXPECT_EQ(&a, static_cast<uint32_t*>(b));
}
} // namespace
} // namespace tint::utils

View File

@ -19,6 +19,7 @@
#include <cstring> #include <cstring>
#include <utility> #include <utility>
#include "src/tint/utils/bitcast.h"
#include "src/tint/utils/math.h" #include "src/tint/utils/math.h"
namespace tint::utils { namespace tint::utils {
@ -231,14 +232,7 @@ class BlockAllocator {
} }
auto* base = &block_.current->data[0]; auto* base = &block_.current->data[0];
auto* addr = static_cast<void*>(base + block_.current_offset); auto* ptr = utils::Bitcast<TYPE*>(base + block_.current_offset);
// Use a memcpy to reinterpret 'void* addr' as 'TYPE* ptr'.
// This is done without using a static_cast, as Clang's Control Flow Integrity checks can
// trigger for this cast, as we're casting from uint8_t* to TYPE*.
// See: crbug.com/dawn/1406
// See: https://clang.llvm.org/docs/ControlFlowIntegrity.html#bad-cast-checking
TYPE* ptr;
memcpy(&ptr, &addr, sizeof(addr));
block_.current_offset += sizeof(TYPE); block_.current_offset += sizeof(TYPE);
return ptr; return ptr;
} }

View File

@ -357,6 +357,7 @@ tint_unittests_source_set("tint_unittests_transform_src") {
tint_unittests_source_set("tint_unittests_utils_src") { tint_unittests_source_set("tint_unittests_utils_src") {
sources = [ sources = [
"../../src/tint/utils/bitcast_test.cc",
"../../src/tint/utils/crc32_test.cc", "../../src/tint/utils/crc32_test.cc",
"../../src/tint/utils/defer_test.cc", "../../src/tint/utils/defer_test.cc",
"../../src/tint/utils/enum_set_test.cc", "../../src/tint/utils/enum_set_test.cc",