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

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
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
1525 summary->AddTemp(Location::RequiresRegister());
1522 summary->AddTemp(Location::RequiresRegister()); 1526 summary->AddTemp(Location::RequiresRegister());
1523 } 1527 }
1524 if (field().guarded_cid() == kIllegalCid) { 1528 const bool need_field_temp_reg =
1529 field_has_length || (field().guarded_cid() == kIllegalCid);
1530 if (need_field_temp_reg) {
1525 summary->AddTemp(Location::RequiresRegister()); 1531 summary->AddTemp(Location::RequiresRegister());
1526 } 1532 }
1527 return summary; 1533 return summary;
1528 } 1534 }
1529 1535
1530 1536
1531 void GuardFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { 1537 void GuardFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
1532 const intptr_t field_cid = field().guarded_cid(); 1538 const intptr_t field_cid = field().guarded_cid();
1533 const intptr_t nullability = field().is_nullable() ? kNullCid : kIllegalCid; 1539 const intptr_t nullability = field().is_nullable() ? kNullCid : kIllegalCid;
1540 const intptr_t field_length = field().guarded_list_length();
1541 const bool field_has_length = field().needs_length_check();
1542 const bool needs_value_temp_reg =
1543 (field_has_length || ((value()->Type()->ToCid() == kDynamicCid) &&
1544 (field().guarded_cid() != kSmiCid)));
1545 const bool needs_field_temp_reg =
1546 field_has_length || (field().guarded_cid() == kIllegalCid);
1547 if (field_has_length) {
1548 // Currently, we should only see final fields that remember length.
1549 ASSERT(field().is_final());
1550 }
1534 1551
1535 if (field_cid == kDynamicCid) { 1552 if (field_cid == kDynamicCid) {
1536 ASSERT(!compiler->is_optimizing()); 1553 ASSERT(!compiler->is_optimizing());
1537 return; // Nothing to emit. 1554 return; // Nothing to emit.
1538 } 1555 }
1539 1556
1540 const intptr_t value_cid = value()->Type()->ToCid(); 1557 const intptr_t value_cid = value()->Type()->ToCid();
1541 1558
1542 Register value_reg = locs()->in(0).reg(); 1559 Register value_reg = locs()->in(0).reg();
1543 1560
1544 Register value_cid_reg = ((value_cid == kDynamicCid) && 1561 Register value_cid_reg = needs_value_temp_reg ?
1545 (field_cid != kSmiCid)) ? locs()->temp(0).reg() : kNoRegister; 1562 locs()->temp(0).reg() : kNoRegister;
1563 Register temp_reg = needs_value_temp_reg ?
1564 locs()->temp(1).reg() : kNoRegister;
1546 1565
1547 Register field_reg = (field_cid == kIllegalCid) ? 1566 Register field_reg = needs_field_temp_reg ?
1548 locs()->temp(locs()->temp_count() - 1).reg() : kNoRegister; 1567 locs()->temp(locs()->temp_count() - 1).reg() : kNoRegister;
1549 1568
1550 Label ok, fail_label; 1569 Label ok, fail_label;
1551 1570
1552 Label* deopt = compiler->is_optimizing() ? 1571 Label* deopt = compiler->is_optimizing() ?
1553 compiler->AddDeoptStub(deopt_id(), kDeoptGuardField) : NULL; 1572 compiler->AddDeoptStub(deopt_id(), kDeoptGuardField) : NULL;
1554 1573
1555 Label* fail = (deopt != NULL) ? deopt : &fail_label; 1574 Label* fail = (deopt != NULL) ? deopt : &fail_label;
1556 1575
1557 const bool ok_is_fall_through = (deopt != NULL); 1576 const bool ok_is_fall_through = (deopt != NULL);
1558 1577
1559 if (!compiler->is_optimizing() || (field_cid == kIllegalCid)) { 1578 if (!compiler->is_optimizing() || (field_cid == kIllegalCid)) {
1560 if (!compiler->is_optimizing()) { 1579 if (!compiler->is_optimizing() && (field_reg == kNoRegister)) {
1561 // Currently we can't have different location summaries for optimized 1580 // Currently we can't have different location summaries for optimized
1562 // and non-optimized code. So instead we manually pick up a register 1581 // 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 1582 // that is known to be free because we know how non-optimizing compiler
1564 // allocates registers. 1583 // allocates registers.
1565 field_reg = R2; 1584 field_reg = R2;
1566 ASSERT((field_reg != value_reg) && (field_reg != value_cid_reg)); 1585 ASSERT((field_reg != value_reg) && (field_reg != value_cid_reg));
1567 } 1586 }
1568 1587
1569 __ LoadObject(field_reg, Field::ZoneHandle(field().raw())); 1588 __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
1570 1589
1571 FieldAddress field_cid_operand(field_reg, Field::guarded_cid_offset()); 1590 FieldAddress field_cid_operand(field_reg, Field::guarded_cid_offset());
1572 FieldAddress field_nullability_operand( 1591 FieldAddress field_nullability_operand(
1573 field_reg, Field::is_nullable_offset()); 1592 field_reg, Field::is_nullable_offset());
1593 FieldAddress field_length_operand(
1594 field_reg, Field::guarded_list_length_offset());
1574 1595
1575 if (value_cid_reg == kNoRegister) { 1596 if (value_cid_reg == kNoRegister) {
1576 ASSERT(!compiler->is_optimizing()); 1597 ASSERT(!compiler->is_optimizing());
1577 value_cid_reg = R3; 1598 value_cid_reg = R3;
1578 ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg)); 1599 ASSERT((value_cid_reg != value_reg) && (field_reg != value_cid_reg));
1579 } 1600 }
1580 1601
1581 if (value_cid == kDynamicCid) { 1602 if (value_cid == kDynamicCid) {
1582 LoadValueCid(compiler, value_cid_reg, value_reg); 1603 LoadValueCid(compiler, value_cid_reg, value_reg);
1604 Label skip_length_check;
1583 __ ldr(IP, field_cid_operand); 1605 __ ldr(IP, field_cid_operand);
1584 __ cmp(value_cid_reg, ShifterOperand(IP)); 1606 __ cmp(value_cid_reg, ShifterOperand(IP));
1585 __ b(&ok, EQ); 1607 __ b(&skip_length_check, NE);
1608 if (field_has_length) {
1609 ASSERT(temp_reg != kNoRegister);
1610 // Field guard may have remembered list length, check it.
1611 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1612 __ ldr(temp_reg,
1613 FieldAddress(value_reg, Array::length_offset()));
1614 __ CompareImmediate(temp_reg, field_length);
1615 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1616 __ ldr(temp_reg,
1617 FieldAddress(value_reg, TypedData::length_offset()));
1618 __ CompareImmediate(temp_reg, field_length);
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 ASSERT(temp_reg != kNoRegister);
1639 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1640 __ ldr(temp_reg,
1641 FieldAddress(value_reg, Array::length_offset()));
1642 __ CompareImmediate(temp_reg, field_length);
1643 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1644 __ ldr(temp_reg,
1645 FieldAddress(value_reg, TypedData::length_offset()));
1646 __ CompareImmediate(temp_reg, field_length);
1647 } else {
1648 ASSERT(field_cid == kIllegalCid);
1649 // Following jump cannot not occur, fall through.
1650 }
1651 }
1652 // Not identical, possibly null.
1653 __ Bind(&skip_length_check);
1594 } 1654 }
1595 __ b(&ok, EQ); 1655 __ b(&ok, EQ);
1596 1656
1597 __ ldr(IP, field_cid_operand); 1657 __ ldr(IP, field_cid_operand);
1598 __ CompareImmediate(IP, kIllegalCid); 1658 __ CompareImmediate(IP, kIllegalCid);
1599 __ b(fail, NE); 1659 __ b(fail, NE);
1600 1660
1601 if (value_cid == kDynamicCid) { 1661 if (value_cid == kDynamicCid) {
1602 __ str(value_cid_reg, field_cid_operand); 1662 __ str(value_cid_reg, field_cid_operand);
1603 __ str(value_cid_reg, field_nullability_operand); 1663 __ str(value_cid_reg, field_nullability_operand);
1664 if (field_has_length) {
1665 Label check_array, local_exit, local_fail;
1666 __ CompareImmediate(value_cid_reg, kNullCid);
1667 __ b(&local_fail, EQ);
1668 // Check for typed data array.
1669 __ CompareImmediate(value_cid_reg, kTypedDataFloat32x4ArrayCid);
1670 __ b(&local_fail, GT);
1671 __ CompareImmediate(value_cid_reg, kTypedDataInt8ArrayCid);
1672 __ b(&check_array, LT); // Could still be a regular array.
1673 // Destroy value_cid_reg (safe because we are finished with it).
1674 __ ldr(value_cid_reg,
1675 FieldAddress(value_reg, TypedData::length_offset()));
1676 __ str(value_cid_reg, field_length_operand);
1677 __ b(&local_exit); // Updated field length typed data array.
1678 // Check for regular array.
1679 __ Bind(&check_array);
1680 __ CompareImmediate(value_cid_reg, kImmutableArrayCid);
1681 __ b(&local_fail, GT);
1682 __ CompareImmediate(value_cid_reg, kArrayCid);
1683 __ b(&local_fail, LT);
1684 // Destroy value_cid_reg (safe because we are finished with it).
1685 __ ldr(value_cid_reg,
1686 FieldAddress(value_reg, Array::length_offset()));
1687 __ str(value_cid_reg, field_length_operand);
1688 __ b(&local_exit); // Updated field length from regular array.
1689
1690 __ Bind(&local_fail);
1691 __ LoadImmediate(IP, Field::kNoFixedLength);
1692 __ str(IP, field_length_operand);
1693
1694 __ Bind(&local_exit);
1695 }
1604 } else { 1696 } else {
1605 __ LoadImmediate(IP, value_cid); 1697 __ LoadImmediate(IP, value_cid);
1606 __ str(IP, field_cid_operand); 1698 __ str(IP, field_cid_operand);
1607 __ str(IP, field_nullability_operand); 1699 __ str(IP, field_nullability_operand);
1700 if ((value_cid == kArrayCid) || (value_cid == kImmutableArrayCid)) {
1701 // Destroy value_cid_reg (safe because we are finished with it).
1702 __ ldr(value_cid_reg,
1703 FieldAddress(value_reg, Array::length_offset()));
1704 __ str(value_cid_reg, field_length_operand);
1705 } else if (RawObject::IsTypedDataClassId(value_cid)) {
1706 // Destroy value_cid_reg (safe because we are finished with it).
1707 __ ldr(value_cid_reg,
1708 FieldAddress(value_reg, TypedData::length_offset()));
1709 __ str(value_cid_reg, field_length_operand);
1710 } else {
1711 __ LoadImmediate(IP, Field::kNoFixedLength);
1712 __ str(IP, field_length_operand);
1713 }
1608 } 1714 }
1609 1715
1610 if (!ok_is_fall_through) { 1716 if (!ok_is_fall_through) {
1611 __ b(&ok); 1717 __ b(&ok);
1612 } 1718 }
1613 } else { 1719 } else {
1720 if (field_reg != kNoRegister) {
1721 __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));
1722 }
1614 if (value_cid == kDynamicCid) { 1723 if (value_cid == kDynamicCid) {
1615 // Field's guarded class id is fixed by value's class id is not known. 1724 // Field's guarded class id is fixed by value's class id is not known.
1616 __ tst(value_reg, ShifterOperand(kSmiTagMask)); 1725 __ tst(value_reg, ShifterOperand(kSmiTagMask));
1617 1726
1618 if (field_cid != kSmiCid) { 1727 if (field_cid != kSmiCid) {
1619 __ b(fail, EQ); 1728 __ b(fail, EQ);
1620 __ LoadClassId(value_cid_reg, value_reg); 1729 __ LoadClassId(value_cid_reg, value_reg);
1621 __ CompareImmediate(value_cid_reg, field_cid); 1730 __ CompareImmediate(value_cid_reg, field_cid);
1622 } 1731 }
1623 1732
1733 if (field_has_length) {
1734 __ b(fail, NE);
1735 // Classes are same, perform guarded list length check.
1736 ASSERT(field_reg != kNoRegister);
1737 ASSERT(value_cid_reg != kNoRegister);
1738 FieldAddress field_length_operand(
1739 field_reg, Field::guarded_list_length_offset());
1740 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1741 // Destroy value_cid_reg (safe because we are finished with it).
1742 __ ldr(value_cid_reg,
1743 FieldAddress(value_reg, Array::length_offset()));
1744 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1745 // Destroy value_cid_reg (safe because we are finished with it).
1746 __ ldr(value_cid_reg,
1747 FieldAddress(value_reg, TypedData::length_offset()));
1748 }
1749 __ ldr(IP, field_length_operand);
1750 __ cmp(value_cid_reg, ShifterOperand(IP));
1751 }
1752
1624 if (field().is_nullable() && (field_cid != kNullCid)) { 1753 if (field().is_nullable() && (field_cid != kNullCid)) {
1625 __ b(&ok, EQ); 1754 __ b(&ok, EQ);
1626 __ CompareImmediate(value_reg, 1755 __ CompareImmediate(value_reg,
1627 reinterpret_cast<intptr_t>(Object::null())); 1756 reinterpret_cast<intptr_t>(Object::null()));
1628 } 1757 }
1629 1758
1630 if (ok_is_fall_through) { 1759 if (ok_is_fall_through) {
1631 __ b(fail, NE); 1760 __ b(fail, NE);
1632 } else { 1761 } else {
1633 __ b(&ok, EQ); 1762 __ b(&ok, EQ);
1634 } 1763 }
1635 } else { 1764 } else {
1636 // Both value's and field's class id is known. 1765 // Both value's and field's class id is known.
1637 if ((value_cid != field_cid) && (value_cid != nullability)) { 1766 if ((value_cid != field_cid) && (value_cid != nullability)) {
1638 if (ok_is_fall_through) { 1767 if (ok_is_fall_through) {
1639 __ b(fail); 1768 __ b(fail);
1640 } 1769 }
1770 } else if (field_has_length && (value_cid == field_cid)) {
1771 ASSERT(value_cid_reg != kNoRegister);
1772 if ((field_cid == kArrayCid) || (field_cid == kImmutableArrayCid)) {
1773 // Destroy value_cid_reg (safe because we are finished with it).
1774 __ ldr(value_cid_reg,
1775 FieldAddress(value_reg, Array::length_offset()));
1776 } else if (RawObject::IsTypedDataClassId(field_cid)) {
1777 // Destroy value_cid_reg (safe because we are finished with it).
1778 __ ldr(value_cid_reg,
1779 FieldAddress(value_reg, TypedData::length_offset()));
1780 }
1781 __ LoadImmediate(IP, field_length);
1782 __ cmp(value_cid_reg, ShifterOperand(IP));
1783 if (ok_is_fall_through) {
1784 __ b(fail, NE);
1785 }
1641 } else { 1786 } else {
1642 // Nothing to emit. 1787 // Nothing to emit.
1643 ASSERT(!compiler->is_optimizing()); 1788 ASSERT(!compiler->is_optimizing());
1644 return; 1789 return;
1645 } 1790 }
1646 } 1791 }
1647 } 1792 }
1648 1793
1649 if (deopt == NULL) { 1794 if (deopt == NULL) {
1650 ASSERT(!compiler->is_optimizing()); 1795 ASSERT(!compiler->is_optimizing());
(...skipping 2847 matching lines...) Expand 10 before | Expand all | Expand 10 after
4498 compiler->GenerateCall(token_pos(), 4643 compiler->GenerateCall(token_pos(),
4499 &label, 4644 &label,
4500 PcDescriptors::kOther, 4645 PcDescriptors::kOther,
4501 locs()); 4646 locs());
4502 __ Drop(2); // Discard type arguments and receiver. 4647 __ Drop(2); // Discard type arguments and receiver.
4503 } 4648 }
4504 4649
4505 } // namespace dart 4650 } // namespace dart
4506 4651
4507 #endif // defined TARGET_ARCH_ARM 4652 #endif // defined TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698