Skip to content

Commit 2365456

Browse files
committed
Squelch some GCC warnings
Mostly signed/unsigned comparison mismatches.
1 parent 8ec0259 commit 2365456

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/core/WorkItem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,8 +1439,8 @@ INSTRUCTION(shuffle)
14391439
const llvm::Value* v1 = shuffle->getOperand(0);
14401440
const llvm::Value* v2 = shuffle->getOperand(1);
14411441

1442-
unsigned num =
1443-
llvm::cast<llvm::FixedVectorType>(v1->getType())->getNumElements();
1442+
int num = static_cast<int>(
1443+
llvm::cast<llvm::FixedVectorType>(v1->getType())->getNumElements());
14441444
for (unsigned i = 0; i < result.num; i++)
14451445
{
14461446
const llvm::Value* src = v1;

src/core/common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ size_t resolveGEP(size_t base, const llvm::Type* sourceElementType,
877877
address += offsets[0] * getTypeSize(sourceElementType);
878878

879879
// Iterate over indices
880-
for (int i = 1; i < offsets.size(); i++)
880+
for (size_t i = 1; i < offsets.size(); i++)
881881
{
882882
int64_t offset = offsets[i];
883883

src/kernel/Simulation.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ bool Simulation::load(const char* filename)
256256
void Simulation::parseArgument(size_t index)
257257
{
258258
// Argument parsing parameters
259-
size_t size = -1;
259+
size_t size = SIZE_MAX;
260260
cl_mem_flags flags = 0;
261261
ArgDataType type = TYPE_NONE;
262262
size_t typeSize = 0;
@@ -437,13 +437,13 @@ void Simulation::parseArgument(size_t index)
437437
// Ensure size given
438438
if (null)
439439
{
440-
if (size != -1 || !fill.empty() || !range.empty() || noinit || dump)
440+
if (size != SIZE_MAX || !fill.empty() || !range.empty() || noinit || dump)
441441
{
442442
throw "'null' not valid with other argument descriptors";
443443
}
444444
size = 0;
445445
}
446-
else if (size == -1)
446+
else if (size == SIZE_MAX)
447447
{
448448
throw "size required";
449449
}
@@ -643,7 +643,7 @@ template <typename T>
643643
void Simulation::parseArgumentData(unsigned char* result, size_t size)
644644
{
645645
vector<T> data;
646-
for (int i = 0; i < size / sizeof(T); i++)
646+
for (size_t i = 0; i < size / sizeof(T); i++)
647647
{
648648
T value;
649649
if (sizeof(T) == 1)
@@ -666,7 +666,7 @@ void Simulation::parseFill(unsigned char* result, size_t size,
666666
istringstream& fill)
667667
{
668668
T value = readValue<T>(fill);
669-
for (int i = 0; i < size / sizeof(T); i++)
669+
for (size_t i = 0; i < size / sizeof(T); i++)
670670
{
671671
((T*)result)[i] = value;
672672
}

src/plugins/Uninitialized.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,8 +1644,8 @@ void Uninitialized::instructionExecuted(const WorkItem* workItem,
16441644
TypedValue newShadow = ShadowContext::getCleanValue(result);
16451645
TypedValue pv = ShadowContext::getPoisonedValue(newShadow.size);
16461646

1647-
unsigned num =
1648-
llvm::cast<llvm::FixedVectorType>(v1->getType())->getNumElements();
1647+
int num = static_cast<int>(
1648+
llvm::cast<llvm::FixedVectorType>(v1->getType())->getNumElements());
16491649
for (unsigned i = 0; i < newShadow.num; i++)
16501650
{
16511651
int index = shuffleInst->getMaskValue(i);

src/plugins/Uninitialized.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// #define PARANOID_CHECK(W, I) assert(checkAllOperandsDefined(W, I) && "Not all
1515
// operands defined") #define PARANOID_CHECK(W, I) checkAllOperandsDefined(W,
1616
// I)
17-
#define PARANOID_CHECK(W, I) (void*)0
17+
#define PARANOID_CHECK(W, I) static_assert(true)
1818

1919
namespace oclgrind
2020
{

0 commit comments

Comments
 (0)