Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: runtime/vm/intermediate_language_arm.cc

Issue 22851003: Initial support for length guards on final fields. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM. 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM.
6 #if defined(TARGET_ARCH_ARM) 6 #if defined(TARGET_ARCH_ARM)
7 7
8 #include "vm/intermediate_language.h" 8 #include "vm/intermediate_language.h"
9 9
10 #include "vm/dart_entry.h" 10 #include "vm/dart_entry.h"
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1510 UNREACHABLE(); 1510 UNREACHABLE();
1511 } 1511 }
1512 } 1512 }
1513 1513
1514 1514
1515 LocationSummary* GuardFieldInstr::MakeLocationSummary() const { 1515 LocationSummary* GuardFieldInstr::MakeLocationSummary() const {
1516 const intptr_t kNumInputs = 1; 1516 const intptr_t kNumInputs = 1;
1517 LocationSummary* summary = 1517 LocationSummary* summary =
1518 new LocationSummary(kNumInputs, 0, LocationSummary::kNoCall); 1518 new LocationSummary(kNumInputs, 0, LocationSummary::kNoCall);
1519 summary->set_in(0, Location::RequiresRegister()); 1519 summary->set_in(0, Location::RequiresRegister());
1520 if ((value()->Type()->ToCid() == kDynamicCid) && 1520 const bool field_has_length = field().needs_length_check();
1521 (field().guarded_cid() != kSmiCid)) { 1521 const bool need_value_temp_reg =
1522 (field_has_length || ((value()->Type()->ToCid() == kDynamicCid) &&
1523 (field().guarded_cid() != kSmiCid)));
1524 if (need_value_temp_reg) {
1522 summary->AddTemp(Location::RequiresRegister()); 1525 summary->AddTemp(Location::RequiresRegister());
1523 } 1526 }
1524 if (field().guarded_cid() == kIllegalCid) { 1527 const bool need_field_temp_reg =
1528 field_has_length || (field().guarded_cid() == kIllegalCid);
1529 if (need_field_temp_reg) {
1525 summary->AddTemp(Location::RequiresRegister()); 1530 summary->AddTemp(Location::RequiresRegister());
1526 } 1531 }
1527 return summary; 1532 return summary;
1528 } 1533 }
1529 1534
1530 1535
1531 void GuardFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { 1536 void GuardFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
1532 const intptr_t field_cid = field().guarded_cid(); 1537 const intptr_t field_cid = field().guarded_cid();
1533 const intptr_t nullability = field().is_nullable() ? kNullCid : kIllegalCid; 1538 const intptr_t nullability = field().is_nullable() ? kNullCid : kIllegalCid;
1539 const intptr_t field_length = field().guarded_list_length();
1540 const bool field_has_length = field().needs_length_check();
1541 const bool needs_value_temp_reg =
1542 (field_has_length || ((value()->Type()->ToCid() == kDynamicCid) &&
1543 (field().guarded_cid() != kSmiCid)));
1544 const bool needs_field_temp_reg =
1545 field_has_length || (field().guarded_cid() == kIllegalCid);
1546 if (field_has_length) {
1547 // Currently, we should only see final fields that remember length.
1548 ASSERT(field().is_final());
1549 }
1534 1550
1535 if (field_cid == kDynamicCid) { 1551 if (field_cid == kDynamicCid) {
1536 ASSERT(!compiler->is_optimizing()); 1552 ASSERT(!compiler->is_optimizing());
1537 return; // Nothing to emit. 1553 return; // Nothing to emit.
1538 } 1554 }
1539 1555
1540 const intptr_t value_cid = value()->Type()->ToCid(); 1556 const intptr_t value_cid = value()->Type()->ToCid();
1541 1557
1542 Register value_reg = locs()->in(0).reg(); 1558 Register value_reg = locs()->in(0).reg();
1543 1559
1544 Register value_cid_reg = ((value_cid == kDynamicCid) && 1560 Register value_cid_reg = needs_value_temp_reg ?
1545 (field_cid != kSmiCid)) ? locs()->temp(0).reg() : kNoRegister; 1561 locs()->temp(0).reg() : kNoRegister;
1546 1562
1547 Register field_reg = (field_cid == kIllegalCid) ? 1563 Register field_reg = needs_field_temp_reg ?
1548 locs()->temp(locs()->temp_count() - 1).reg() : kNoRegister; 1564 locs()->temp(locs()->temp_count() - 1).reg() : kNoRegister;
1549 1565
1550 Label ok, fail_label; 1566 Label ok, fail_label;
1551 1567
1552 Label* deopt = compiler->is_optimizing() ? 1568 Label* deopt = compiler->is_optimizing() ?
1553 compiler->AddDeoptStub(deopt_id(), kDeoptGuardField) : NULL; 1569 compiler->AddDeoptStub(deopt_id(), kDeoptGuardField) : NULL;
1554 1570
1555 Label* fail = (deopt != NULL) ? deopt : &fail_label; 1571 Label* fail = (deopt != NULL) ? deopt : &fail_label;
1556 1572
1557 const bool ok_is_fall_through = (deopt != NULL); 1573 const bool ok_is_fall_through = (deopt != NULL);
1558 1574
1559 if (!compiler->is_optimizing() || (field_cid == kIllegalCid)) { 1575 if (!compiler->is_optimizing() || (field_cid == kIllegalCid)) {
1560 if (!compiler->is_optimizing()) { 1576 if (!compiler->is_optimizing() && (field_reg == kNoRegister)) {
1561 // Currently we can't have different location summaries for optimized 1577 // Currently we can't have different location summaries for optimized
1562 // and non-optimized code. So instead we manually pick up a register 1578 // and non-optimized code. So instead we manually pick up a register
1563 // that is known to be free because we know how non-optimizing compiler 1579 // that is known to be free because we know how non-optimizing compiler
1564 // allocates registers. 1580 // allocates registers.
1565 field_reg = R2; 1581 field_reg = R2;
1566 ASSERT((field_reg != value_reg) && (field_reg != value_cid_reg)); 1582 ASSERT((field_reg != value_reg) && (field_reg != value_cid_reg));
1567 } 1583 }
1568 1584
1569 __ LoadObject(field_reg, Field::ZoneHandle(field().raw())); 1585 __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
1570 1586
1571 FieldAddress field_cid_operand(field_reg, Field::guarded_cid_offset()); 1587 FieldAddress field_cid_operand(field_reg, Field::guarded_cid_offset());
1572 FieldAddress field_nullability_operand( 1588 FieldAddress field_nullability_operand(
1573 field_reg, Field::is_nullable_offset()); 1589 field_reg, Field::is_nullable_offset());
1590 FieldAddress field_length_operand(
1591 field_reg, Field::guarded_list_length_offset());
1574 1592
1575 if (value_cid_reg == kNoRegister) { 1593 if (value_cid_reg == kNoRegister) {
1576 ASSERT(!compiler->is_optimizing()); 1594 ASSERT(!compiler->is_optimizing());
1577 value_cid_reg = R3; 1595 value_cid_reg = R3;
1578 ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg)); 1596 ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
1579 } 1597 }
1580 1598
1581 if (value_cid == kDynamicCid) { 1599 if (value_cid == kDynamicCid) {
1582 LoadValueCid(compiler, value_cid_reg, value_reg); 1600 LoadValueCid(compiler, value_cid_reg, value_reg);
1601 Label skip_length_check;
1583 __ ldr(IP, field_cid_operand); 1602 __ ldr(IP, field_cid_operand);
1584 __ cmp(value_cid_reg, ShifterOperand(IP)); 1603 __ cmp(value_cid_reg, ShifterOperand(IP));
1585 __ b(&ok, EQ); 1604 __ b(&skip_length_check, NE);
1605 if (field_has_length) {
1606 // Field guard may have remembered list length, check it.
1607 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1608 __ Push(value_cid_reg);
regis 2013/08/20 21:24:04 Instead of all the push/pop pairs below, can you a
Cutch 2013/08/20 22:48:51 Done.
1609 __ ldr(value_cid_reg,
1610 FieldAddress(value_reg, Array::length_offset()));
1611 __ CompareImmediate(value_cid_reg, field_length);
1612 __ Pop(value_cid_reg);
1613 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1614 __ Push(value_cid_reg);
1615 __ ldr(value_cid_reg,
1616 FieldAddress(value_reg, TypedData::length_offset()));
1617 __ CompareImmediate(value_cid_reg, field_length);
1618 __ Pop(value_cid_reg);
1619 } else {
1620 ASSERT(field_cid == kIllegalCid);
1621 // Following branch cannot not occur, fall through.
1622 }
1623 __ b(fail, NE);
1624 }
1625 __ Bind(&skip_length_check);
1586 __ ldr(IP, field_nullability_operand); 1626 __ ldr(IP, field_nullability_operand);
1587 __ cmp(value_cid_reg, ShifterOperand(IP)); 1627 __ cmp(value_cid_reg, ShifterOperand(IP));
1588 } else if (value_cid == kNullCid) { 1628 } else if (value_cid == kNullCid) {
1589 __ ldr(value_cid_reg, field_nullability_operand); 1629 __ ldr(value_cid_reg, field_nullability_operand);
1590 __ CompareImmediate(value_cid_reg, value_cid); 1630 __ CompareImmediate(value_cid_reg, value_cid);
1591 } else { 1631 } else {
1632 Label skip_length_check;
1592 __ ldr(value_cid_reg, field_cid_operand); 1633 __ ldr(value_cid_reg, field_cid_operand);
1593 __ CompareImmediate(value_cid_reg, value_cid); 1634 __ CompareImmediate(value_cid_reg, value_cid);
1635 __ b(&skip_length_check, NE);
1636 if (field_has_length) {
1637 ASSERT(value_cid_reg != kNoRegister);
1638 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1639 __ Push(value_cid_reg);
1640 __ ldr(value_cid_reg,
1641 FieldAddress(value_reg, Array::length_offset()));
1642 __ CompareImmediate(value_cid_reg, field_length);
1643 __ Pop(value_cid_reg);
1644 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1645 __ Push(value_cid_reg);
1646 __ ldr(value_cid_reg,
1647 FieldAddress(value_reg, TypedData::length_offset()));
1648 __ CompareImmediate(value_cid_reg, field_length);
1649 __ Pop(value_cid_reg);
1650 } else {
1651 ASSERT(field_cid == kIllegalCid);
1652 // Following jump cannot not occur, fall through.
1653 }
1654 }
1655 // Not identical, possibly null.
1656 __ Bind(&skip_length_check);
1594 } 1657 }
1595 __ b(&ok, EQ); 1658 __ b(&ok, EQ);
1596 1659
1597 __ ldr(IP, field_cid_operand); 1660 __ ldr(IP, field_cid_operand);
1598 __ CompareImmediate(IP, kIllegalCid); 1661 __ CompareImmediate(IP, kIllegalCid);
1599 __ b(fail, NE); 1662 __ b(fail, NE);
1600 1663
1601 if (value_cid == kDynamicCid) { 1664 if (value_cid == kDynamicCid) {
1602 __ str(value_cid_reg, field_cid_operand); 1665 __ str(value_cid_reg, field_cid_operand);
1603 __ str(value_cid_reg, field_nullability_operand); 1666 __ str(value_cid_reg, field_nullability_operand);
1667 if (field_has_length) {
1668 Label check_array, local_exit, local_fail;
1669 __ CompareImmediate(value_cid_reg, kNullCid);
1670 __ b(&local_fail, EQ);
1671 // Check for typed data array.
1672 __ CompareImmediate(value_cid_reg, kTypedDataFloat32x4ArrayCid);
1673 __ b(&local_fail, GT);
1674 __ CompareImmediate(value_cid_reg, kTypedDataInt8ArrayCid);
1675 __ b(&check_array, LT); // Could still be a regular array.
1676 // Destroy value_cid_reg (safe because we are finished with it).
1677 __ ldr(value_cid_reg,
1678 FieldAddress(value_reg, TypedData::length_offset()));
1679 __ str(value_cid_reg, field_length_operand);
1680 __ b(&local_exit); // Updated field length typed data array.
1681 // Check for regular array.
1682 __ Bind(&check_array);
1683 __ CompareImmediate(value_cid_reg, kImmutableArrayCid);
1684 __ b(&local_fail, GT);
1685 __ CompareImmediate(value_cid_reg, kArrayCid);
1686 __ b(&local_fail, LT);
1687 // Destroy value_cid_reg (safe because we are finished with it).
1688 __ ldr(value_cid_reg,
1689 FieldAddress(value_reg, Array::length_offset()));
1690 __ str(value_cid_reg, field_length_operand);
1691 __ b(&local_exit); // Updated field length from regular array.
1692
1693 __ Bind(&local_fail);
1694 __ LoadImmediate(IP, Field::kNoFixedLength);
1695 __ str(IP, field_length_operand);
1696
1697 __ Bind(&local_exit);
1698 }
1604 } else { 1699 } else {
1605 __ LoadImmediate(IP, value_cid); 1700 __ LoadImmediate(IP, value_cid);
1606 __ str(IP, field_cid_operand); 1701 __ str(IP, field_cid_operand);
1607 __ str(IP, field_nullability_operand); 1702 __ str(IP, field_nullability_operand);
1703 if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
1704 // Destroy value_cid_reg (safe because we are finished with it).
1705 __ ldr(value_cid_reg,
1706 FieldAddress(value_reg, Array::length_offset()));
1707 __ str(value_cid_reg, field_length_operand);
1708 } else if (RawObject::IsTypedDataClassId(value_cid)) {
1709 // Destroy value_cid_reg (safe because we are finished with it).
1710 __ ldr(value_cid_reg,
1711 FieldAddress(value_reg, TypedData::length_offset()));
1712 __ str(value_cid_reg, field_length_operand);
1713 } else {
1714 __ LoadImmediate(IP, Field::kNoFixedLength);
1715 __ str(IP, field_length_operand);
1716 }
1608 } 1717 }
1609 1718
1610 if (!ok_is_fall_through) { 1719 if (!ok_is_fall_through) {
1611 __ b(&ok); 1720 __ b(&ok);
1612 } 1721 }
1613 } else { 1722 } else {
1723 if (field_reg != kNoRegister) {
1724 __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
1725 }
1614 if (value_cid == kDynamicCid) { 1726 if (value_cid == kDynamicCid) {
1615 // Field's guarded class id is fixed by value's class id is not known. 1727 // Field's guarded class id is fixed by value's class id is not known.
1616 __ tst(value_reg, ShifterOperand(kSmiTagMask)); 1728 __ tst(value_reg, ShifterOperand(kSmiTagMask));
1617 1729
1618 if (field_cid != kSmiCid) { 1730 if (field_cid != kSmiCid) {
1619 __ b(fail, EQ); 1731 __ b(fail, EQ);
1620 __ LoadClassId(value_cid_reg, value_reg); 1732 __ LoadClassId(value_cid_reg, value_reg);
1621 __ CompareImmediate(value_cid_reg, field_cid); 1733 __ CompareImmediate(value_cid_reg, field_cid);
1622 } 1734 }
1623 1735
1736 if (field_has_length) {
1737 __ b(fail, NE);
1738 // Classes are same, perform guarded list length check.
1739 ASSERT(field_reg != kNoRegister);
1740 ASSERT(value_cid_reg != kNoRegister);
1741 FieldAddress field_length_operand(
1742 field_reg, Field::guarded_list_length_offset());
1743 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1744 // Destroy value_cid_reg (safe because we are finished with it).
1745 __ ldr(value_cid_reg,
1746 FieldAddress(value_reg, Array::length_offset()));
1747 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1748 // Destroy value_cid_reg (safe because we are finished with it).
1749 __ ldr(value_cid_reg,
1750 FieldAddress(value_reg, TypedData::length_offset()));
1751 }
1752 __ ldr(IP, field_length_operand);
1753 __ cmp(value_cid_reg, ShifterOperand(IP));
1754 }
1755
1624 if (field().is_nullable() && (field_cid != kNullCid)) { 1756 if (field().is_nullable() && (field_cid != kNullCid)) {
1625 __ b(&ok, EQ); 1757 __ b(&ok, EQ);
1626 __ CompareImmediate(value_reg, 1758 __ CompareImmediate(value_reg,
1627 reinterpret_cast<intptr_t>(Object::null())); 1759 reinterpret_cast<intptr_t>(Object::null()));
1628 } 1760 }
1629 1761
1630 if (ok_is_fall_through) { 1762 if (ok_is_fall_through) {
1631 __ b(fail, NE); 1763 __ b(fail, NE);
1632 } else { 1764 } else {
1633 __ b(&ok, EQ); 1765 __ b(&ok, EQ);
1634 } 1766 }
1635 } else { 1767 } else {
1636 // Both value's and field's class id is known. 1768 // Both value's and field's class id is known.
1637 if ((value_cid != field_cid) && (value_cid != nullability)) { 1769 if ((value_cid != field_cid) && (value_cid != nullability)) {
1638 if (ok_is_fall_through) { 1770 if (ok_is_fall_through) {
1639 __ b(fail); 1771 __ b(fail);
1640 } 1772 }
1773 } else if (field_has_length && (value_cid == field_cid)) {
1774 ASSERT(value_cid_reg != kNoRegister);
1775 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1776 // Destroy value_cid_reg (safe because we are finished with it).
1777 __ ldr(value_cid_reg,
1778 FieldAddress(value_reg, Array::length_offset()));
1779 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1780 // Destroy value_cid_reg (safe because we are finished with it).
1781 __ ldr(value_cid_reg,
1782 FieldAddress(value_reg, TypedData::length_offset()));
1783 }
1784 __ LoadImmediate(IP, field_length);
1785 __ cmp(value_cid_reg, ShifterOperand(IP));
1786 if (ok_is_fall_through) {
1787 __ b(fail, NE);
1788 }
1641 } else { 1789 } else {
1642 // Nothing to emit. 1790 // Nothing to emit.
1643 ASSERT(!compiler->is_optimizing()); 1791 ASSERT(!compiler->is_optimizing());
1644 return; 1792 return;
1645 } 1793 }
1646 } 1794 }
1647 } 1795 }
1648 1796
1649 if (deopt == NULL) { 1797 if (deopt == NULL) {
1650 ASSERT(!compiler->is_optimizing()); 1798 ASSERT(!compiler->is_optimizing());
(...skipping 2807 matching lines...) Expand 10 before | Expand all | Expand 10 after
4458 compiler->GenerateCall(token_pos(), 4606 compiler->GenerateCall(token_pos(),
4459 &label, 4607 &label,
4460 PcDescriptors::kOther, 4608 PcDescriptors::kOther,
4461 locs()); 4609 locs());
4462 __ Drop(2); // Discard type arguments and receiver. 4610 __ Drop(2); // Discard type arguments and receiver.
4463 } 4611 }
4464 4612
4465 } // namespace dart 4613 } // namespace dart
4466 4614
4467 #endif // defined TARGET_ARCH_ARM 4615 #endif // defined TARGET_ARCH_ARM
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698