Closed Bug 503556 Opened 15 years ago Closed 15 years ago

Merge tamarin-redux and tracemonkey nanojit branches

Categories

(Tamarin Graveyard :: Baseline JIT (CodegenLIR), defect, P2)

Product:
Tamarin Graveyard
Component:
Baseline JIT (CodegenLIR)
Type:
defect

Tracking

(Not tracked)

Status:
VERIFIED FIXED
Milestone:
flash10.1

People

(Reporter: edwsmith, Unassigned)

References

Details

Attachments

(1 obsolete file)

Attached patch normalize whitespace and modelines (obsolete) — — Splinter Review 
Tracking bug for merging the two branches.

see also 
https://developer.mozilla.org/en/NanojitMerge

Minor patches can attach here, major ones in dependent bugs.
Attachment #387912 - Flags: review?(rreitmai)
Attachment #387912 - Attachment is patch: true
Attachment #387912 - Attachment mime type: application/octet-stream → text/plain
Attachment #387912 - Flags: review?(rreitmai) → review+
Comment on attachment 387912 [details] [diff] [review]
normalize whitespace and modelines

pushed http://hg.mozilla.org/tamarin-redux/rev/a1d4cb5acbee
Attachment #387912 - Attachment is obsolete: true
OS: Mac OS X → All
Hardware: x86 → All
Depends on: 503874
Depends on: 504462
Depends on: 504465
Depends on: 504607
Depends on: 505256
Depends on: 505502
Depends on: 505875
Depends on: 505909
Depends on: 506138
Depends on: 506146
Depends on: 507031
Depends on: 507036
Depends on: 507039
Depends on: 507042
Depends on: 507117
Depends on: 507302
Depends on: 509634
Depends on: 509586
Depends on: 509596
Depends on: 509598
Depends on: 509818
Depends on: 509833
Depends on: 509856
Depends on: 509883
Depends on: 509885
Depends on: 509890
Depends on: 509893
Depends on: 510036
Depends on: 510078
Depends on: 510095
Depends on: 510116
Depends on: 510545
Depends on: 510602
Depends on: 511182
Depends on: 511919
Depends on: 511972
Depends on: 512366
Depends on: 515539
Depends on: 515548
Depends on: 515822
Depends on: 516567
Depends on: 517308
Depends on: 517328
Depends on: 517331
Depends on: 517333
Depends on: 517366
Depends on: 517530
Depends on: 517562
Depends on: 517601
Depends on: 518011
Depends on: 518020
Depends on: 518025
Depends on: 518031
Depends on: 518034
Depends on: 518040
Depends on: 518041
Depends on: 518042
Depends on: 518043
Depends on: 518045
Depends on: 518488
Depends on: 518706
Nb: bug 503424, which added TMFLAGS=fragprofile, is a big remaining difference between TM and TR.  Merging that change will see a big reduction in the diffs.
Bug 495734, which removed all uses of skips with payloads in TM and changed the signature of insGuard(), is another one that will greatly reduce the diffs when merged with TR.

There's also one dealing with the removal of explicitSavedRegs from TM, but I can't find the bug number on that one.
Depends on: 518737
Depends on: 518759
Depends on: 518878
Depends on: 518887
Depends on: 518906
Depends on: 516620
Depends on: 519347
Depends on: 519349
Depends on: 519360
Depends on: 519383
Depends on: 519527
Depends on: 519535
Depends on: 519561
Depends on: 519575
Depends on: 519856
Depends on: 519768
Depends on: 519873
Depends on: 519877
Depends on: 519884
Depends on: 520099
Flags: flashplayer-triage+
Depends on: 521506
Depends on: 521691
Depends on: 522153
Depends on: 522314
Depends on: 522316
Depends on: 522328
Depends on: 522333
Depends on: 522363
Depends on: 522384
Depends on: 522399
Depends on: 522413
Depends on: 522341
Depends on: 522558
Depends on: 522587
Depends on: 522591
Depends on: 518493
Depends on: 522755
Depends on: 522772
Depends on: 522773
Depends on: 522798
Depends on: 522834
Depends on: 523189
Depends on: 523258
Depends on: 523262
Depends on: 523416
Depends on: 523500
Depends on: 523505
Depends on: 523766
Depends on: 523767
Depends on: 523952
Depends on: 523956
Priority: -- → P2
Target Milestone: --- → flash10.1
Depends on: 491084
Depends on: 524158
Depends on: 524230
Depends on: 524231
Depends on: 524236
Depends on: 524578
Depends on: 524587
Depends on: 524593
Depends on: 525293
Depends on: 525347
No longer depends on: 506146
Depends on: 526074
Blocks: 519877
No longer depends on: 519877
Blocks: 524231
No longer depends on: 524231
Blocks: 526914
The merge is complete!  

Moving all open Dependencies to bug 526914 in order to simplify tracking...closing this one out.
Status: NEW → RESOLVED
Closed: 15 years ago
No longer depends on: 525347, 526074
Resolution: --- → FIXED
Status: RESOLVED → VERIFIED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: