Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Seedarg/member/wip #5

Closed
wants to merge 104 commits into from
Closed

Seedarg/member/wip #5

wants to merge 104 commits into from

Commits on Feb 1, 2019

  1. Add "randomize_layout" attribute

    @connorkuehl
    connorkuehl committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    3b9829e View commit details
    Browse the repository at this point in the history

  2. testing: Emit message when randomize_layout

    @connorkuehl
    connorkuehl committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    9b0f3de View commit details
    Browse the repository at this point in the history

  3. Rename Randomized to RandomizeLayout

    @connorkuehl
    connorkuehl committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    f8da259 View commit details
    Browse the repository at this point in the history

  4. fix: Go back to using D's field iterators

    @connorkuehl
    connorkuehl committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    7d221cd View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2019

  1. fix: Oops, actually use correct iterators

    @connorkuehl
    connorkuehl committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    5749304 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. Add reorder method for RecordDecl

    @connorkuehl
    connorkuehl committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    18bcbc0 View commit details
    Browse the repository at this point in the history

  2. Fix infinite loop by updating tail ptr

    @connorkuehl
    connorkuehl committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    8a27707 View commit details
    Browse the repository at this point in the history

  3. Hack: quick and dirty randomization for testing!

    @connorkuehl
    connorkuehl committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    a3fa3dd View commit details
    Browse the repository at this point in the history

  4. Move Randomization to getASTRecordLayout

    @connorkuehl
    connorkuehl committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    4ff065b View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2019

  1. Added the 'no_randomize_layout' attr to clang

    @Nixoncole
    Nixoncole committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    5d6b7c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Add performance sensitive randomization 

    Co-authored-by: James Foster <[email protected]>
    @connorkuehl @Jafosterja
    connorkuehl and Jafosterja committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    1ed67ef View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Merge pull request #17 from connorkuehl/port-randomization 

    Add (port) performance sensitive randomization
    Tim Pugh authored Feb 15, 2019
    Configuration menu
    Copy the full SHA
    4ba74e9 View commit details
    Browse the repository at this point in the history

  2. Delete hacky reorderFields method

    @connorkuehl
    connorkuehl committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    73325c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. Merge branch 'develop' of https://github.com/connorkuehl/llvm-project … 

    …into no_ranomize_layout_attr
    @Nixoncole
    Nixoncole committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    53fec8d View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. WIP, first attempt at emitting compiler warning

    @Nixoncole
    Nixoncole committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    456bd5a View commit details
    Browse the repository at this point in the history

  2. Refactor code into tidier classes 

    New changes:

* RecordFieldOrganizer is an interface that
  can be used to manipulate a RecordDecl's
  field order.
* RecordFieldOrganizer is a "friend" to the
  DeclContext (which maintains the linked list)
* The Randstruct class is a subclass that performs
  cache friendly randomization
    @connorkuehl
    connorkuehl committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    16160e3 View commit details
    Browse the repository at this point in the history

  3. Added declaration of Diagnostic(), receiving errors.

    @Nixoncole
    Nixoncole committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    b1f11a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. builds, but cannot compile. Cant find stdio.h

    @Nixoncole
    Nixoncole committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    dee16c7 View commit details
    Browse the repository at this point in the history

  2. Sync with upstream

    @connorkuehl
    connorkuehl committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    bf4b55f View commit details
    Browse the repository at this point in the history

  3. Added the 'no_randomize_layout' attr to clang

    @Nixoncole
    Nixoncole authored and jeff committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    063f1b1 View commit details
    Browse the repository at this point in the history

  4. WIP, first attempt at emitting compiler warning

    @Nixoncole
    Nixoncole authored and jeff committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    938b5cf View commit details
    Browse the repository at this point in the history

  5. Added declaration of Diagnostic(), receiving errors.

    @Nixoncole
    Nixoncole authored and jeff committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    e1af06f View commit details
    Browse the repository at this point in the history

  6. builds, but cannot compile. Cant find stdio.h

    @Nixoncole
    Nixoncole authored and jeff committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    a4a855d View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2019

  1. putting RandstructSeed in Decl.h

    Jordan Cantrell committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    11d18d7 View commit details
    Browse the repository at this point in the history

  2. RandomizeLayout identification for regression test This commit is to 

    resolve the identification of the RandomizeLayout attribute to the
regression test suite. Without this, running "make clang-test" will
result in a failure due to it identifying an attribute but not having it
included in
../clang/test/Misc/pragma-attribute-supported-attributes-list.test. This
protects against the addition/removal of attributes.
    Tim Pugh committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    d76e98b View commit details
    Browse the repository at this point in the history

  3. remove RandstructSeed declaration from Decl.h

    Jordan Cantrell committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    3deff88 View commit details
    Browse the repository at this point in the history

  4. Revert commit so it may be introduced by PR 

    This reverts commit d76e98b.
    @connorkuehl
    connorkuehl committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    753b226 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. RandomizeLayout identification for regression test 

    This commit is to resolve the identification of the RandomizeLayout
attribute to the regression test suite. Without this, running "make clang-test" will
result in a failure due to it identifying an attribute but not having it
included in:

../clang/test/Misc/pragma-attribute-supported-attributes-list.test.

This protects against the addition/removal of attributes.
    Tim Pugh committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    69c348e View commit details
    Browse the repository at this point in the history

  2. RandomizeLayout identification for regression test 

    This commit is to resolve the identification of the RandomizeLayout
attribute to the regression test suite. Without this, running "make clang-test" will
result in a failure due to it identifying an attribute but not having it
included in:

../clang/test/Misc/pragma-attribute-supported-attributes-list.test.

This protects against the addition/removal of attributes.

Co-authored-by:Nikk <[email protected]>
    Tim Pugh committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    5e9c123 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'RandomizeLayout_Regression_Test_Addition' of https://gi… 

    …thub.com/clang-randstruct/llvm-project into RandomizeLayout_Regression_Test_Addition
    Tim Pugh committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    12c5b41 View commit details
    Browse the repository at this point in the history

  4. value not being saved in global

    Jordan Cantrell committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    162bda5 View commit details
    Browse the repository at this point in the history

  5. removing unused coede

    Jordan Cantrell committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    97bb5ce View commit details
    Browse the repository at this point in the history

  6. removing randstruct constructor call

    Jordan Cantrell committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    6ef63eb View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2019

  1. Added basic implementation of auto selection for strucutres of only f… 

    …unction pointers
    @Jafosterja
    Jafosterja committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    e0cfd8a View commit details
    Browse the repository at this point in the history

  2. Clean up PR 

    PR was slightly behind, update and fix punctuation
    jeff committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    9d3845e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'no_ranomize_layout_attr' of https://github.com/clang-ra… 

    …ndstruct/llvm-project into no_ranomize_layout_attr
    jeff committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    287458e View commit details
    Browse the repository at this point in the history

  4. Add DiagGroup to NoRandomizeLayout attribute 

    All attributes that emit warnings are required
to be members of a warning group; this is checked
by the clang-test regression suite.
    @connorkuehl
    connorkuehl committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    f94de06 View commit details
    Browse the repository at this point in the history

  5. Add NoRandomizeLayout to supported attributes list 

    All supported attributes must be etched in stone
in the supported attributes regression test.
    @connorkuehl
    connorkuehl committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    fadd247 View commit details
    Browse the repository at this point in the history

  6. Add space after semicolon in warning message

    @connorkuehl
    connorkuehl committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    ae1bf92 View commit details
    Browse the repository at this point in the history

  7. test commit

    Jordan Cantrell committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    b3a2306 View commit details
    Browse the repository at this point in the history

  8. printf debugging

    Jordan Cantrell committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    a9200c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2019

  1. manually adding arg before executing

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    5ceee39 View commit details
    Browse the repository at this point in the history

  2. adding include to job.cpp

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    5dd2a45 View commit details
    Browse the repository at this point in the history

  3. First draft for attribute documentation

    @Nixoncole
    Nixoncole committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    7272914 View commit details
    Browse the repository at this point in the history

  4. throwaway commit

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    76f2bd1 View commit details
    Browse the repository at this point in the history

  5. more printf debugging

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    c4863cc View commit details
    Browse the repository at this point in the history

  6. even more printf debugging

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    1dbbe31 View commit details
    Browse the repository at this point in the history

  7. Edit ClangRandstruct entry in AttrDocs.td

    jeff committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    09a54e9 View commit details
    Browse the repository at this point in the history

  8. added frandstruct-seed= to CC1Options.td

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    d1d871c View commit details
    Browse the repository at this point in the history

  9. added frandstruct-seed= to CC1Options.td

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    efa2157 View commit details
    Browse the repository at this point in the history

  10. removing =

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    7a329b5 View commit details
    Browse the repository at this point in the history

  11. removing =

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    495b157 View commit details
    Browse the repository at this point in the history

  12. error: linker -f may not be used without -shared

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    651fdc4 View commit details
    Browse the repository at this point in the history

  13. error: linker -f may not be used without -shared

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    013a77d View commit details
    Browse the repository at this point in the history

  14. error: linker -f may not be used without -shared

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    184695d View commit details
    Browse the repository at this point in the history

  15. gen. commit

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    0594d7e View commit details
    Browse the repository at this point in the history

  16. wip fixing linker errors

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    3656e01 View commit details
    Browse the repository at this point in the history

  17. wip fixing linker errors

    Jordan Cantrell committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    f07aff2 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. wip fixing linker errors

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    213041f View commit details
    Browse the repository at this point in the history

  2. wip fixing linker errors

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    ab0393f View commit details
    Browse the repository at this point in the history

  3. wip fixing linker errors

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    d923c6f View commit details
    Browse the repository at this point in the history

  4. wip fixing linker errors

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    25246d2 View commit details
    Browse the repository at this point in the history

  5. wip fixing linker errors

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    1455704 View commit details
    Browse the repository at this point in the history

  6. wip fixing linker errors

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    3dcf748 View commit details
    Browse the repository at this point in the history

  7. (#20) Merge RandomizeLayout regression test

    @connorkuehl
    connorkuehl committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    b47a59e View commit details
    Browse the repository at this point in the history

  8. generic commit

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    46b491e View commit details
    Browse the repository at this point in the history

  9. generic commit

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    d149823 View commit details
    Browse the repository at this point in the history

  10. generic commit

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    58cfc9b View commit details
    Browse the repository at this point in the history

  11. generic commit

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    e0dcc7a View commit details
    Browse the repository at this point in the history

  12. generic commit

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    8590e8e View commit details
    Browse the repository at this point in the history

  13. generic commit

    Jordan Cantrell committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    690b679 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. generic commit

    Jordan Cantrell committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    82bd310 View commit details
    Browse the repository at this point in the history

  2. Docs for the single attribute, 'randomize_layout'.

    @Nixoncole
    Nixoncole committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    9949798 View commit details
    Browse the repository at this point in the history

  3. touched up other docs ad ran 'clang-format'

    @Nixoncole
    Nixoncole committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    f06d4cc View commit details
    Browse the repository at this point in the history

  4. Refactored the auto selection code

    @Jafosterja
    Jafosterja committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    6fedc9d View commit details
    Browse the repository at this point in the history

  5. generic commit

    Jordan Cantrell committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    6900a62 View commit details
    Browse the repository at this point in the history

  6. Changed frandstruct to randstruct

    tim-pugh committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    9cab894 View commit details
    Browse the repository at this point in the history

  7. Removed 'header' that is only for when you include docs for multiple … 

    …attributes
    @Nixoncole
    Nixoncole committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    ca2372f View commit details
    Browse the repository at this point in the history

  8. Added comments

    @Jafosterja
    Jafosterja committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    63cf353 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #27 from clang-randstruct/randomize_layout_docs 

    Randomize layout docs
    @jeffreytakahashi
    jeffreytakahashi authored Feb 26, 2019
    Configuration menu
    Copy the full SHA
    a9655bd View commit details
    Browse the repository at this point in the history

  10. Merge pull request #26 from jcantrell/seedarg/global/wip 

    Seedarg/global/wip
    Tim Pugh authored Feb 26, 2019
    Configuration menu
    Copy the full SHA
    f5e549d View commit details
    Browse the repository at this point in the history

  11. Revert "(#20) Merge RandomizeLayout regression test" 

    This reverts commit b47a59e, reversing
changes made to 753b226.
    tim-pugh committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    312a0e6 View commit details
    Browse the repository at this point in the history

  12. Re-adding regression test fix

    tim-pugh committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    32fae72 View commit details
    Browse the repository at this point in the history

  13. Revert "generic commit" 

    This reverts commit 6900a62.
    tim-pugh committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    d95e624 View commit details
    Browse the repository at this point in the history

  14. Skip Unions when selecting from randomization 

    There's no harmful effect if we DO randomize a union, however,
since all of a union's data members have their offsets set to 0
there's no advantage for our code to run anyway. This way we can
spare some CPU cycles in the event that someone adds the randomize
attribute to their union.
    @connorkuehl
    connorkuehl committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    fe25c0e View commit details
    Browse the repository at this point in the history

  15. Add warning when union has randomize_layout attr

    @connorkuehl
    connorkuehl committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    1731e3a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Removed const qualifier from reorganize() and randomize(), since rng … 

    …is changed on the call to shuffle()
    Jordan Cantrell committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    e39c922 View commit details
    Browse the repository at this point in the history

  2. merging changes from develop

    Jordan Cantrell committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    e33d38e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #35 from clang-randstruct/seedarg/global/wip 

    Changed frandstruct to randstruct
    Tim Pugh authored Feb 27, 2019
    Configuration menu
    Copy the full SHA
    ca6c6d8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #33 from clang-randstruct/skip-unions 

    Skip unions
    Tim Pugh authored Feb 27, 2019
    Configuration menu
    Copy the full SHA
    be0971b View commit details
    Browse the repository at this point in the history

  5. Removed unnecessary functions

    @Jafosterja
    Jafosterja committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    b4446bd View commit details
    Browse the repository at this point in the history

  6. adding flag

    Jordan Cantrell committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    0a9f695 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into randstruct-auto

    @connorkuehl
    connorkuehl committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    dd7a572 View commit details
    Browse the repository at this point in the history

  8. Add -randstruct-auto command line argument

    @connorkuehl
    connorkuehl committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    3e53f43 View commit details
    Browse the repository at this point in the history

  9. Refactored code for better readability

    @Jafosterja
    Jafosterja committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    97166c8 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'randstruct-auto' into Autoselect

    @connorkuehl
    connorkuehl committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    a8106ca View commit details
    Browse the repository at this point in the history

  11. Delete NoRandomizeLayout check 

    This will be checked at our entry point, so we don't
need to check this here.
    @connorkuehl
    connorkuehl committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    2a220f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. merging in develop

    jordan committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    46a4a57 View commit details
    Browse the repository at this point in the history

  2. Added changes requested by Nixoncole

    @Jafosterja
    Jafosterja committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    2c5f3eb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #29 from clang-randstruct/Autoselect 

    Autoselect
    Tim Pugh authored Feb 28, 2019
    Configuration menu
    Copy the full SHA
    3a0479d View commit details
    Browse the repository at this point in the history

  4. merging in changes from develop

    jordan committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    20696c1 View commit details
    Browse the repository at this point in the history

  5. generic commit

    jordan committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    e3be585 View commit details
    Browse the repository at this point in the history

  6. generic commit

    jordan committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    dccaff2 View commit details
    Browse the repository at this point in the history

  7. ran clang-format on RecordField/Layout files

    Jordan Cantrell committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    4a6549a View commit details
    Browse the repository at this point in the history