Skip to content

Commit 85f012c

Browse files
author
joaosaffran
committed
clean up
1 parent 216341c commit 85f012c

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

llvm/include/llvm/MC/DXContainerRootSignature.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/BinaryFormat/DXContainer.h"
10-
#include "llvm/Support/raw_ostream.h"
1110

1211
namespace llvm {
1312

1413
class raw_ostream;
1514

1615
namespace mcdxbc {
17-
1816
struct RootSignatureDesc {
1917
dxbc::RootSignatureHeader Header;
2018
SmallVector<dxbc::RootParameter> Parameters;
2119

22-
Error write(raw_ostream &OS) const;
20+
void write(raw_ostream &OS) const;
2321
};
2422
} // namespace mcdxbc
2523
} // namespace llvm

llvm/lib/MC/DXContainerRootSignature.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/MC/DXContainerRootSignature.h"
10-
#include "llvm/ADT/SmallVector.h"
11-
#include "llvm/ADT/Twine.h"
1210
#include "llvm/Support/EndianStream.h"
13-
#include "llvm/Support/Error.h"
14-
#include <cstdint>
1511

1612
using namespace llvm;
1713
using namespace llvm::mcdxbc;
@@ -28,7 +24,7 @@ void rewriteOffset(buffer_ostream &Stream, uint32_t Offset) {
2824
support::endian::write(InsertPoint, Value, llvm::endianness::little);
2925
}
3026

31-
Error RootSignatureDesc::write(raw_ostream &OS) const {
27+
void RootSignatureDesc::write(raw_ostream &OS) const {
3228
buffer_ostream Writer(OS);
3329
const uint32_t NumParameters = Parameters.size();
3430
const uint32_t Zero = 0;
@@ -75,6 +71,4 @@ Error RootSignatureDesc::write(raw_ostream &OS) const {
7571
llvm_unreachable("Invalid RootParameterType");
7672
}
7773
}
78-
79-
return Error::success();
8074
}

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
271271
RS.Header.Version = P.RootSignature->Version;
272272
RS.Parameters = std::move(P.RootSignature->Parameters);
273273

274-
if (Error Err = RS.write(OS))
275-
handleAllErrors(std::move(Err));
274+
RS.write(OS);
276275

277276
break;
278277
}

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@
2525
#include "llvm/InitializePasses.h"
2626
#include "llvm/MC/DXContainerPSVInfo.h"
2727
#include "llvm/Pass.h"
28-
#include "llvm/Support/Error.h"
2928
#include "llvm/Support/MD5.h"
3029
#include "llvm/TargetParser/Triple.h"
3130
#include "llvm/Transforms/Utils/ModuleUtils.h"
3231
#include <optional>
33-
#include <utility>
3432

3533
using namespace llvm;
3634
using namespace llvm::dxil;
@@ -175,8 +173,7 @@ void DXContainerGlobals::addRootSignature(Module &M,
175173
SmallString<256> Data;
176174
raw_svector_ostream OS(Data);
177175

178-
if (Error Err = RS.write(OS))
179-
handleAllErrors(std::move(Err));
176+
RS.write(OS);
180177

181178
Constant *Constant =
182179
ConstantDataArray::getString(M.getContext(), Data, /*AddNull*/ false);

0 commit comments

Comments
 (0)