serge-sans-paille updated this revision to Diff 246290. Repository: rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D75057/new/ https://reviews.llvm.org/D75057 Files: clang-tools-extra/clangd/SemanticHighlighting.cpp compiler-rt/lib/fuzzer/FuzzerUtil.cpp llvm/include/llvm/Support/Base64.h llvm/unittests/Support/Base64Test.cpp llvm/unittests/Support/CMakeLists.txt
Index: llvm/unittests/Support/CMakeLists.txt =================================================================== --- llvm/unittests/Support/CMakeLists.txt +++ llvm/unittests/Support/CMakeLists.txt @@ -9,6 +9,7 @@ AnnotationsTest.cpp ARMAttributeParser.cpp ArrayRecyclerTest.cpp + Base64Test.cpp BinaryStreamTest.cpp BlockFrequencyTest.cpp BranchProbabilityTest.cpp Index: llvm/unittests/Support/Base64Test.cpp =================================================================== --- /dev/null +++ llvm/unittests/Support/Base64Test.cpp @@ -0,0 +1,46 @@ +//===- llvm/unittest/Support/Base64.cpp - Base64 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 +// +//===----------------------------------------------------------------------===// +// +// This file implements unit tests for the Base64 functions. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Support/Base64.h" +#include "llvm/ADT/StringRef.h" +#include "gtest/gtest.h" + +using namespace llvm; + +namespace { +/// Tests an arbitrary set of bytes passed as \p Input. +void TestBase64(StringRef Input, StringRef Final) { + auto Res = encodeBase64(Input); + EXPECT_EQ(Res, Final); +} + +} // namespace + +TEST(Base64Test, Base64) { + // from: https://tools.ietf.org/html/rfc4648#section-10 + TestBase64("", ""); + TestBase64("f", "Zg=="); + TestBase64("fo", "Zm8="); + TestBase64("foo", "Zm9v"); + TestBase64("foob", "Zm9vYg=="); + TestBase64("fooba", "Zm9vYmE="); + TestBase64("foobar", "Zm9vYmFy"); + + // Large test case + char LargeVector[] = {0x54, 0x68, 0x65, 0x20, 0x71, 0x75, 0x69, 0x63, 0x6b, + 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x20, 0x66, 0x6f, + 0x78, 0x20, 0x6a, 0x75, 0x6d, 0x70, 0x73, 0x20, 0x6f, + 0x76, 0x65, 0x72, 0x20, 0x31, 0x33, 0x20, 0x6c, 0x61, + 0x7a, 0x79, 0x20, 0x64, 0x6f, 0x67, 0x73, 0x2e}; + TestBase64(LargeVector, + "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIDEzIGxhenkgZG9ncy4="); +} Index: llvm/include/llvm/Support/Base64.h =================================================================== --- /dev/null +++ llvm/include/llvm/Support/Base64.h @@ -0,0 +1,53 @@ +//===--- Base64.h - Base64 Encoder/Decoder ----------------------*- 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 +// +//===----------------------------------------------------------------------===// +// +// This file provides generic base64 encoder/decoder. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_SUPPORT_BASE64_H +#define LLVM_SUPPORT_BASE64_H + +#include <string> + +namespace llvm { + +template <class InputBytes> std::string encodeBase64(InputBytes const &Bytes) { + static const char Table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/"; + std::string Buffer; + Buffer.resize(((Bytes.size() + 2) / 3) * 4); + + size_t i = 0, j = 0; + for (size_t n = Bytes.size() / 3 * 3; i < n; i += 3, j += 4) { + uint32_t x = (Bytes[i] << 16) | (Bytes[i + 1] << 8) | Bytes[i + 2]; + Buffer[j + 0] = Table[(x >> 18) & 63]; + Buffer[j + 1] = Table[(x >> 12) & 63]; + Buffer[j + 2] = Table[(x >> 6) & 63]; + Buffer[j + 3] = Table[x & 63]; + } + if (i + 1 == Bytes.size()) { + uint32_t x = (Bytes[i] << 16); + Buffer[j + 0] = Table[(x >> 18) & 63]; + Buffer[j + 1] = Table[(x >> 12) & 63]; + Buffer[j + 2] = '='; + Buffer[j + 3] = '='; + } else if (i + 2 == Bytes.size()) { + uint32_t x = (Bytes[i] << 16) | (Bytes[i + 1] << 8); + Buffer[j + 0] = Table[(x >> 18) & 63]; + Buffer[j + 1] = Table[(x >> 12) & 63]; + Buffer[j + 2] = Table[(x >> 6) & 63]; + Buffer[j + 3] = '='; + } + return Buffer; +} + +} // end namespace llvm + +#endif Index: compiler-rt/lib/fuzzer/FuzzerUtil.cpp =================================================================== --- compiler-rt/lib/fuzzer/FuzzerUtil.cpp +++ compiler-rt/lib/fuzzer/FuzzerUtil.cpp @@ -151,32 +151,36 @@ return true; } +// Code duplicated (and tested) in llvm/include/llvm/Support/Base64.h std::string Base64(const Unit &U) { static const char Table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789+/"; - std::string Res; - size_t i; - for (i = 0; i + 2 < U.size(); i += 3) { - uint32_t x = (U[i] << 16) + (U[i + 1] << 8) + U[i + 2]; - Res += Table[(x >> 18) & 63]; - Res += Table[(x >> 12) & 63]; - Res += Table[(x >> 6) & 63]; - Res += Table[x & 63]; + std::string Buffer; + Buffer.resize(((U.size() + 2) / 3) * 4); + + size_t i = 0, j = 0; + for (size_t n = U.size() / 3 * 3; i < n; i += 3, j += 4) { + uint32_t x = (U[i] << 16) | (U[i + 1] << 8) | U[i + 2]; + Buffer[j + 0] = Table[(x >> 18) & 63]; + Buffer[j + 1] = Table[(x >> 12) & 63]; + Buffer[j + 2] = Table[(x >> 6) & 63]; + Buffer[j + 3] = Table[x & 63]; } if (i + 1 == U.size()) { uint32_t x = (U[i] << 16); - Res += Table[(x >> 18) & 63]; - Res += Table[(x >> 12) & 63]; - Res += "=="; + Buffer[j + 0] = Table[(x >> 18) & 63]; + Buffer[j + 1] = Table[(x >> 12) & 63]; + Buffer[j + 2] = '='; + Buffer[j + 3] = '='; } else if (i + 2 == U.size()) { - uint32_t x = (U[i] << 16) + (U[i + 1] << 8); - Res += Table[(x >> 18) & 63]; - Res += Table[(x >> 12) & 63]; - Res += Table[(x >> 6) & 63]; - Res += "="; + uint32_t x = (U[i] << 16) | (U[i + 1] << 8); + Buffer[j + 0] = Table[(x >> 18) & 63]; + Buffer[j + 1] = Table[(x >> 12) & 63]; + Buffer[j + 2] = Table[(x >> 6) & 63]; + Buffer[j + 3] = '='; } - return Res; + return Buffer; } static std::mutex SymbolizeMutex; Index: clang-tools-extra/clangd/SemanticHighlighting.cpp =================================================================== --- clang-tools-extra/clangd/SemanticHighlighting.cpp +++ clang-tools-extra/clangd/SemanticHighlighting.cpp @@ -26,6 +26,7 @@ #include "llvm/ADT/None.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/Support/Base64.h" #include "llvm/Support/Casting.h" #include <algorithm> @@ -283,37 +284,6 @@ HighlightingsBuilder &H; }; -// Encode binary data into base64. -// This was copied from compiler-rt/lib/fuzzer/FuzzerUtil.cpp. -// FIXME: Factor this out into llvm/Support? -std::string encodeBase64(const llvm::SmallVectorImpl<char> &Bytes) { - static const char Table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789+/"; - std::string Res; - size_t I; - for (I = 0; I + 2 < Bytes.size(); I += 3) { - uint32_t X = (Bytes[I] << 16) + (Bytes[I + 1] << 8) + Bytes[I + 2]; - Res += Table[(X >> 18) & 63]; - Res += Table[(X >> 12) & 63]; - Res += Table[(X >> 6) & 63]; - Res += Table[X & 63]; - } - if (I + 1 == Bytes.size()) { - uint32_t X = (Bytes[I] << 16); - Res += Table[(X >> 18) & 63]; - Res += Table[(X >> 12) & 63]; - Res += "=="; - } else if (I + 2 == Bytes.size()) { - uint32_t X = (Bytes[I] << 16) + (Bytes[I + 1] << 8); - Res += Table[(X >> 18) & 63]; - Res += Table[(X >> 12) & 63]; - Res += Table[(X >> 6) & 63]; - Res += "="; - } - return Res; -} - void write32be(uint32_t I, llvm::raw_ostream &OS) { std::array<char, 4> Buf; llvm::support::endian::write32be(Buf.data(), I);
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
