mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
f3ff561c6f
This is phase-1 of switching from llvm::Optional to std::optional in the
next rebranch. llvm::Optional was removed from upstream LLVM, so we need
to migrate off rather soon. On Darwin, std::optional, and llvm::Optional
have the same layout, so we don't need to be as concerned about ABI
beyond the name mangling. `llvm::Optional` is only returned from one
function in
```
getStandardTypeSubst(StringRef TypeName,
bool allowConcurrencyManglings);
```
It's the return value, so it should not impact the mangling of the
function, and the layout is the same as `std::optional`, so it should be
mostly okay. This function doesn't appear to have users, and the ABI was
already broken 2 years ago for concurrency and no one seemed to notice
so this should be "okay".
I'm doing the migration incrementally so that folks working on main can
cherry-pick back to the release/5.9 branch. Once 5.9 is done and locked
away, then we can go through and finish the replacement. Since `None`
and `Optional` show up in contexts where they are not `llvm::None` and
`llvm::Optional`, I'm preparing the work now by going through and
removing the namespace unwrapping and making the `llvm` namespace
explicit. This should make it fairly mechanical to go through and
replace llvm::Optional with std::optional, and llvm::None with
std::nullopt. It's also a change that can be brought onto the
release/5.9 with minimal impact. This should be an NFC change.
58 lines
1.9 KiB
C++
58 lines
1.9 KiB
C++
//===--- Fingerprint.cpp - A stable identity for compiler data --*- C++ -*-===//
|
|
//
|
|
// This source file is part of the Swift.org open source project
|
|
//
|
|
// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
|
|
// Licensed under Apache License v2.0 with Runtime Library Exception
|
|
//
|
|
// See https://swift.org/LICENSE.txt for license information
|
|
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "swift/Basic/Fingerprint.h"
|
|
#include "swift/Basic/STLExtras.h"
|
|
#include "llvm/Support/Format.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
|
|
#include <inttypes.h>
|
|
#include <sstream>
|
|
|
|
using namespace swift;
|
|
|
|
llvm::raw_ostream &llvm::operator<<(llvm::raw_ostream &OS,
|
|
const Fingerprint &FP) {
|
|
return OS << FP.getRawValue();
|
|
}
|
|
|
|
void swift::simple_display(llvm::raw_ostream &out, const Fingerprint &fp) {
|
|
out << fp.getRawValue();
|
|
}
|
|
|
|
llvm::Optional<Fingerprint> Fingerprint::fromString(llvm::StringRef value) {
|
|
assert(value.size() == Fingerprint::DIGEST_LENGTH &&
|
|
"Only supports 32-byte hash values!");
|
|
auto fp = Fingerprint::ZERO();
|
|
{
|
|
std::istringstream s(value.drop_back(Fingerprint::DIGEST_LENGTH/2).str());
|
|
s >> std::hex >> fp.core.first;
|
|
}
|
|
{
|
|
std::istringstream s(value.drop_front(Fingerprint::DIGEST_LENGTH/2).str());
|
|
s >> std::hex >> fp.core.second;
|
|
}
|
|
// If the input string is not valid hex, the conversion above can fail.
|
|
if (value != fp.getRawValue())
|
|
return llvm::None;
|
|
|
|
return fp;
|
|
}
|
|
|
|
llvm::SmallString<Fingerprint::DIGEST_LENGTH> Fingerprint::getRawValue() const {
|
|
llvm::SmallString<Fingerprint::DIGEST_LENGTH> Str;
|
|
llvm::raw_svector_ostream Res(Str);
|
|
Res << llvm::format_hex_no_prefix(core.first, 16);
|
|
Res << llvm::format_hex_no_prefix(core.second, 16);
|
|
return Str;
|
|
}
|