Merge tamarin-redux and tracemonkey nanojit branches

VERIFIED FIXED in flash10.1

Status

Tamarin
Baseline JIT (CodegenLIR)
P2
normal
VERIFIED FIXED
9 years ago
8 years ago

People

(Reporter: Edwin Smith, Unassigned)

Tracking

unspecified
flash10.1

Details

Attachments

(1 obsolete attachment)

(Reporter)

Description

9 years ago
Created attachment 387912 [details] [diff] [review]
normalize whitespace and modelines

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)

Updated

9 years ago
Attachment #387912 - Attachment is patch: true
Attachment #387912 - Attachment mime type: application/octet-stream → text/plain

Updated

9 years ago
Attachment #387912 - Flags: review?(rreitmai) → review+
(Reporter)

Comment 1

9 years ago
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
(Reporter)

Updated

9 years ago
Depends on: 503874

Updated

9 years ago
Depends on: 504462

Updated

9 years ago
Depends on: 504465
(Reporter)

Updated

9 years ago
Depends on: 504607
(Reporter)

Updated

9 years ago
Depends on: 505256
(Reporter)

Updated

9 years ago
Depends on: 505502

Updated

9 years ago
Depends on: 505875
(Reporter)

Updated

9 years ago
Depends on: 505909

Updated

9 years ago
Depends on: 506138

Updated

9 years ago
Depends on: 506146

Updated

9 years ago
Depends on: 507031

Updated

9 years ago
Depends on: 507036

Updated

9 years ago
Depends on: 507039

Updated

9 years ago
Depends on: 507042
Depends on: 507117

Updated

9 years ago
Depends on: 507302

Updated

9 years ago
Depends on: 509634

Updated

9 years ago
Depends on: 509586

Updated

9 years ago
Depends on: 509596

Updated

9 years ago
Depends on: 509598

Updated

9 years ago
Depends on: 509818

Updated

9 years ago
Depends on: 509833

Updated

9 years ago
Depends on: 509856

Updated

9 years ago
Depends on: 509883

Updated

9 years ago
Depends on: 509885

Updated

9 years ago
Depends on: 509890

Updated

9 years ago
Depends on: 509893

Updated

9 years ago
Depends on: 510036

Updated

9 years ago
Depends on: 510078

Updated

9 years ago
Depends on: 510095

Updated

9 years ago
Depends on: 510116

Updated

9 years ago
Depends on: 510545

Updated

9 years ago
Depends on: 510602
(Reporter)

Updated

9 years ago
Depends on: 511182

Updated

9 years ago
Depends on: 511919

Updated

9 years ago
Depends on: 511972

Updated

9 years ago
Depends on: 512366

Updated

9 years ago
Depends on: 515539

Updated

9 years ago
Depends on: 515548

Updated

9 years ago
Depends on: 515822

Updated

9 years ago
Depends on: 516567

Updated

8 years ago
Depends on: 517308

Updated

8 years ago
Depends on: 517328

Updated

8 years ago
Depends on: 517331

Updated

8 years ago
Depends on: 517333

Updated

8 years ago
Depends on: 517366

Updated

8 years ago
Depends on: 517530

Updated

8 years ago
Depends on: 517562

Updated

8 years ago
Depends on: 517601

Updated

8 years ago
Depends on: 518011

Updated

8 years ago
Depends on: 518488
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.

Updated

8 years ago
Depends on: 518878

Updated

8 years ago
Depends on: 518887

Updated

8 years ago
Depends on: 518906

Updated

8 years ago
Depends on: 516620

Updated

8 years ago
Depends on: 519347

Updated

8 years ago
Depends on: 519349

Updated

8 years ago
Depends on: 519360

Updated

8 years ago
Depends on: 519527

Updated

8 years ago
Depends on: 519535

Updated

8 years ago
Depends on: 519561

Updated

8 years ago
Depends on: 519575

Updated

8 years ago
Depends on: 519856

Updated

8 years ago
Depends on: 519768

Updated

8 years ago
Depends on: 519873

Updated

8 years ago
Depends on: 519877

Updated

8 years ago
Depends on: 519884

Updated

8 years ago
Depends on: 520099

Updated

8 years ago
Flags: flashplayer-triage+

Updated

8 years ago
Depends on: 521506

Updated

8 years ago
Depends on: 522153

Updated

8 years ago
Depends on: 522314

Updated

8 years ago
Depends on: 522316

Updated

8 years ago
Depends on: 522328

Updated

8 years ago
Depends on: 522333

Updated

8 years ago
Depends on: 522363

Updated

8 years ago
Depends on: 522384

Updated

8 years ago
Depends on: 522399

Updated

8 years ago
Depends on: 522413

Updated

8 years ago
Depends on: 522341

Updated

8 years ago
Depends on: 522558

Updated

8 years ago
Depends on: 522587

Updated

8 years ago
Depends on: 522591

Updated

8 years ago
Depends on: 518493

Updated

8 years ago
Depends on: 522755

Updated

8 years ago
Depends on: 522772

Updated

8 years ago
Depends on: 522773

Updated

8 years ago
Depends on: 522798

Updated

8 years ago
Depends on: 522834

Updated

8 years ago
Depends on: 523189

Updated

8 years ago
Depends on: 523258

Updated

8 years ago
Depends on: 523262

Updated

8 years ago
Depends on: 523416

Updated

8 years ago
Depends on: 523500

Updated

8 years ago
Depends on: 523505

Updated

8 years ago
Depends on: 523766

Updated

8 years ago
Depends on: 523767

Updated

8 years ago
Depends on: 523952

Updated

8 years ago
Depends on: 523956
(Reporter)

Updated

8 years ago
Priority: -- → P2
Target Milestone: --- → flash10.1

Updated

8 years ago
Depends on: 491084

Updated

8 years ago
Depends on: 524158

Updated

8 years ago
Depends on: 524230

Updated

8 years ago
Depends on: 524231

Updated

8 years ago
Depends on: 524236

Updated

8 years ago
Depends on: 524578

Updated

8 years ago
Depends on: 524587

Updated

8 years ago
Depends on: 524593

Updated

8 years ago
Depends on: 525293

Updated

8 years ago
Depends on: 525347
(Reporter)

Updated

8 years ago
No longer depends on: 506146

Updated

8 years ago
Depends on: 526074

Updated

8 years ago
Blocks: 519877
No longer depends on: 519877

Updated

8 years ago
Blocks: 524231
No longer depends on: 524231

Updated

8 years ago
Blocks: 526914

Comment 4

8 years ago
The merge is complete!  

Moving all open Dependencies to bug 526914 in order to simplify tracking...closing this one out.
Status: NEW → RESOLVED
Last Resolved: 8 years ago
No longer depends on: 525347, 526074
Resolution: --- → FIXED

Updated

8 years ago
Status: RESOLVED → VERIFIED
You need to log in before you can comment on or make changes to this bug.