Skip to content

V
V8
Commit 43d3187e authored by jpp's avatar jpp Committed by Commit bot
Browse files
Options

V8. ASM-2-WASM. Small fixes. 

1) Validation fails for literal indexes too large for accessing a given
heap type

2) Removes the special handling of FloatishDoubleQ, and FloatQDoubleQ;
the inheritance issue that required this special handling was fixed in
another CL.

3) Fix a macro name (from asm_* to ASM_*)

BUG= https://bugs.chromium.org/p/v8/issues/detail?id=4203
TEST=cctest/asmjs/test-asm-typer.cc
LOG=N

Review-Url: https://codereview.chromium.org/2150583003
Cr-Commit-Position: refs/heads/master@{#37776}
parent bd03c642
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 50 deletions
src/asmjs/asm-typer.cc
View file @ 43d3187e
......@@ -200,7 +200,7 @@ void AsmTyper::InitializeStdlib() {
const StandardMemberInitializer stdlib[] = {{"Infinity", kInfinity, d},
{"NaN", kNaN, d},
#define asm_TYPED_ARRAYS(V) \
#define ASM_TYPED_ARRAYS(V) \
V(Uint8) \
V(Int8) \
V(Uint16) \
......@@ -210,10 +210,10 @@ void AsmTyper::InitializeStdlib() {
V(Float32) \
V(Float64)
#define asm_TYPED_ARRAY(TypeName) \
#define ASM_TYPED_ARRAY(TypeName) \
{#TypeName "Array", kNone, AsmType::TypeName##Array()},
asm_TYPED_ARRAYS(asm_TYPED_ARRAY)
#undef asm_TYPED_ARRAY
ASM_TYPED_ARRAYS(ASM_TYPED_ARRAY)
#undef ASM_TYPED_ARRAY
};
for (size_t ii = 0; ii < arraysize(stdlib); ++ii) {
stdlib_types_[stdlib[ii].name] = new (zone_) VariableInfo(stdlib[ii].type);
......@@ -1623,22 +1623,8 @@ AsmType* AsmTyper::ValidateAssignmentExpression(Assignment* assignment) {
RECURSE(allowed_store_types =
ValidateHeapAccess(target_as_property, StoreToHeap));
// TODO(jpp): Change FloatishDoubleQ and FloatQDoubleQ so that they are base
// classes for Floatish, DoubleQ, and FloatQ.
if (allowed_store_types == AsmType::FloatishDoubleQ()) {
if (!value_type->IsA(AsmType::Floatish()) &&
!value_type->IsA(AsmType::DoubleQ())) {
FAIL(assignment, "Type mismatch in heap assignment.");
}
} else if (allowed_store_types == AsmType::FloatQDoubleQ()) {
if (!value_type->IsA(AsmType::FloatQ()) &&
!value_type->IsA(AsmType::DoubleQ())) {
FAIL(assignment, "Type mismatch in heap assignment.");
}
} else {
if (!value_type->IsA(allowed_store_types)) {
FAIL(assignment, "Type mismatch in heap assignment.");
}
if (!value_type->IsA(allowed_store_types)) {
FAIL(assignment, "Type mismatch in heap assignment.");
}
return value_type;
......@@ -2294,6 +2280,23 @@ bool ExtractHeapAccessShift(Expression* expr, uint32_t* value) {
return as_literal->value()->ToUint32(value);
}
// Returns whether index is too large to access a heap with the given type.
bool LiteralIndexOutOfBounds(AsmType* obj_type, uint32_t index) {
switch (obj_type->ElementSizeInBytes()) {
case 1:
return false;
case 2:
return (index & 0x80000000u) != 0;
case 4:
return (index & 0xC0000000u) != 0;
case 8:
return (index & 0xE0000000u) != 0;
}
UNREACHABLE();
return true;
}
} // namespace
AsmType* AsmTyper::ValidateHeapAccess(Property* heap,
......@@ -2316,15 +2319,19 @@ AsmType* AsmTyper::ValidateHeapAccess(Property* heap,
if (auto* key_as_literal = heap->key()->AsLiteral()) {
if (key_as_literal->raw_value()->ContainsDot()) {
FAIL(key_as_literal, "Heap access index must be intish.");
FAIL(key_as_literal, "Heap access index must be int.");
}
uint32_t _;
if (!key_as_literal->value()->ToUint32(&_)) {
uint32_t index;
if (!key_as_literal->value()->ToUint32(&index)) {
FAIL(key_as_literal,
"Heap access index must be a 32-bit unsigned integer.");
}
if (LiteralIndexOutOfBounds(obj_type, index)) {
FAIL(key_as_literal, "Heap access index is out of bounds");
}
if (access_type == LoadFromHeap) {
return obj_type->LoadType();
}
......
test/cctest/asmjs/test-asm-typer.cc
View file @ 43d3187e
......@@ -976,7 +976,7 @@ TEST(ErrorsInExpression) {
{"HEAP32[0][0] = 0", "Invalid heap access"},
{"heap32[0] = 0", "Undeclared identifier in heap access"},
{"not_a_function[0] = 0", "Identifier does not represent a heap view"},
{"HEAP32[0.0] = 0", "Heap access index must be intish"},
{"HEAP32[0.0] = 0", "Heap access index must be int"},
{"HEAP32[-1] = 0", "Heap access index must be a 32-bit unsigned integer"},
{"HEAP32[ilocal >> 1] = 0", "Invalid heap access index"},
// *VIOLATION* the following is invalid, but because of desugaring it is
......@@ -1142,22 +1142,22 @@ TEST(ValidateMemberExpression) {
{"U8[2147483648]", iw::AsmType::Intish()},
{"I16[iish >> 1]", iw::AsmType::Intish()},
{"I16[0]", iw::AsmType::Intish()},
{"I16[2147483648]", iw::AsmType::Intish()}, // bug: must be pre-shifted.
{"I16[1073741824]", iw::AsmType::Intish()},
{"U16[iish >> 1]", iw::AsmType::Intish()},
{"U16[0]", iw::AsmType::Intish()},
{"U16[2147483648]", iw::AsmType::Intish()}, // bug: must be pre-shifted.
{"U16[1073741824]", iw::AsmType::Intish()},
{"I32[iish >> 2]", iw::AsmType::Intish()},
{"I32[0]", iw::AsmType::Intish()},
{"I32[2147483648]", iw::AsmType::Intish()}, // bug: must be pre-shifted.
{"I32[536870912]", iw::AsmType::Intish()},
{"U32[iish >> 2]", iw::AsmType::Intish()},
{"U32[0]", iw::AsmType::Intish()},
{"U32[2147483648]", iw::AsmType::Intish()}, // bug: must be pre-shifted.
{"U32[536870912]", iw::AsmType::Intish()},
{"F32[iish >> 2]", iw::AsmType::FloatQ()},
{"F32[0]", iw::AsmType::FloatQ()},
{"F32[2147483648]", iw::AsmType::FloatQ()}, // bug: must be pre-shifted.
{"F32[536870912]", iw::AsmType::FloatQ()},
{"F64[iish >> 3]", iw::AsmType::DoubleQ()},
{"F64[0]", iw::AsmType::DoubleQ()},
{"F64[2147483648]", iw::AsmType::DoubleQ()}, // bug: must be pre-shifted.
{"F64[268435456]", iw::AsmType::DoubleQ()},
};
for (size_t ii = 0; ii < arraysize(kTests); ++ii) {
......@@ -1197,16 +1197,16 @@ TEST(ValidateAssignmentExpression) {
{"U8[2147483648] = -1024", iw::AsmType::Signed()},
{"I16[1024 >> 1] = -1024", iw::AsmType::Signed()},
{"I16[0] = -1024", iw::AsmType::Signed()},
{"I16[2147483648] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"I16[1073741824] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"U16[1024 >> 1] = -1024", iw::AsmType::Signed()},
{"U16[0] = -1024", iw::AsmType::Signed()},
{"U16[2147483648] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"U16[1073741824] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"I32[1024 >> 2] = -1024", iw::AsmType::Signed()},
{"I32[0] = -1024", iw::AsmType::Signed()},
{"I32[2147483648] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"I32[536870912] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"U32[1024 >> 2] = -1024", iw::AsmType::Signed()},
{"U32[0] = -1024", iw::AsmType::Signed()},
{"U32[2147483648] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
{"U32[536870912] = -1024", iw::AsmType::Signed()}, // not pre-shifted.
// Sroting fixnum to int heap view.
{"I8[1024] = 1024", iw::AsmType::FixNum()},
{"I8[1024 >> 0] = 1024", iw::AsmType::FixNum()},
......@@ -1217,16 +1217,16 @@ TEST(ValidateAssignmentExpression) {
{"U8[2147483648] = 1024", iw::AsmType::FixNum()},
{"I16[1024 >> 1] = 1024", iw::AsmType::FixNum()},
{"I16[0] = 1024", iw::AsmType::FixNum()},
{"I16[2147483648] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"I16[1073741824] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"U16[1024 >> 1] = 1024", iw::AsmType::FixNum()},
{"U16[0] = 1024", iw::AsmType::FixNum()},
{"U16[2147483648] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"U16[1073741824] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"I32[1024 >> 2] = 1024", iw::AsmType::FixNum()},
{"I32[0] = 1024", iw::AsmType::FixNum()},
{"I32[2147483648] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"I32[536870912] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"U32[1024 >> 2] = 1024", iw::AsmType::FixNum()},
{"U32[0] = 1024", iw::AsmType::FixNum()},
{"U32[2147483648] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
{"U32[536870912] = 1024", iw::AsmType::FixNum()}, // not pre-shifted.
// Storing int to int heap view.
{"I8[ilocal] = ilocal", iw::AsmType::Int()},
{"I8[ilocal >> 0] = ilocal", iw::AsmType::Int()},
......@@ -1237,16 +1237,16 @@ TEST(ValidateAssignmentExpression) {
{"U8[2147483648] = ilocal", iw::AsmType::Int()},
{"I16[ilocal >> 1] = ilocal", iw::AsmType::Int()},
{"I16[0] = ilocal", iw::AsmType::Int()},
{"I16[2147483648] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"I16[1073741824] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"U16[ilocal >> 1] = ilocal", iw::AsmType::Int()},
{"U16[0] = ilocal", iw::AsmType::Int()},
{"U16[2147483648] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"U16[1073741824] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"I32[ilocal >> 2] = ilocal", iw::AsmType::Int()},
{"I32[0] = ilocal", iw::AsmType::Int()},
{"I32[2147483648] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"I32[536870912] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"U32[ilocal >> 2] = ilocal", iw::AsmType::Int()},
{"U32[0] = ilocal", iw::AsmType::Int()},
{"U32[2147483648] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
{"U32[536870912] = ilocal", iw::AsmType::Int()}, // not pre-shifted.
// Storing intish to int heap view.
{"I8[ilocal] = iish", iw::AsmType::Intish()},
{"I8[iish >> 0] = iish", iw::AsmType::Intish()},
......@@ -1257,32 +1257,32 @@ TEST(ValidateAssignmentExpression) {
{"U8[2147483648] = iish", iw::AsmType::Intish()},
{"I16[iish >> 1] = iish", iw::AsmType::Intish()},
{"I16[0] = iish", iw::AsmType::Intish()},
{"I16[2147483648] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"I16[1073741824] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"U16[iish >> 1] = iish", iw::AsmType::Intish()},
{"U16[0] = iish", iw::AsmType::Intish()},
{"U16[2147483648] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"U16[1073741824] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"I32[iish >> 2] = iish", iw::AsmType::Intish()},
{"I32[0] = iish", iw::AsmType::Intish()},
{"I32[2147483648] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"I32[536870912] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"U32[iish >> 2] = iish", iw::AsmType::Intish()},
{"U32[0] = iish", iw::AsmType::Intish()},
{"U32[2147483648] = iish", iw::AsmType::Intish()}, // not pre-shifted.
{"U32[536870912] = iish", iw::AsmType::Intish()}, // not pre-shifted.
// Storing floatish to f32 heap view.
{"F32[iish >> 2] = fish", iw::AsmType::Floatish()},
{"F32[0] = fish", iw::AsmType::Floatish()},
{"F32[2147483648] = fish ", iw::AsmType::Floatish()}, // not pre-shifted.
{"F32[536870912] = fish ", iw::AsmType::Floatish()}, // not pre-shifted.
// Storing double? to f32 heap view.
{"F32[iish >> 2] = dq", iw::AsmType::DoubleQ()},
{"F32[0] = dq", iw::AsmType::DoubleQ()},
{"F32[2147483648] = dq", iw::AsmType::DoubleQ()}, // not pre-shifted.
{"F32[536870912] = dq", iw::AsmType::DoubleQ()}, // not pre-shifted.
// Storing float? to f64 heap view.
{"F64[iish >> 3] = fq", iw::AsmType::FloatQ()},
{"F64[0] = fq", iw::AsmType::FloatQ()},
{"F64[2147483648] = fq", iw::AsmType::FloatQ()}, // not pre-shifted.
{"F64[268435456] = fq", iw::AsmType::FloatQ()}, // not pre-shifted.
// Storing double? to f64 heap view.
{"F64[iish >> 3] = dq", iw::AsmType::DoubleQ()},
{"F64[0] = dq", iw::AsmType::DoubleQ()},
{"F64[2147483648] = dq", iw::AsmType::DoubleQ()}, // not pre-shifted.
{"F64[268435456] = dq", iw::AsmType::DoubleQ()}, // not pre-shifted.
// -----------------------------------------------------------------------
// Scalar assignments.
{"ilocal = 1024", iw::AsmType::FixNum()},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment