Not support anonymous union in struct #317 #391

alexey-utkin · 2022-08-22T09:55:19Z

No description provided.

- better tests for union printer - less divergent between struct and union

alexey-utkin

Fixing
[PERF] UTBot consumes CPU in spinlocks #382

alexey-utkin · 2022-08-23T06:37:49Z

server/src/Server.cpp

        while (holdLockFlag[callbackName].exchange(true, std::memory_order_acquire)) {
-            std::this_thread::yield();
+            std::this_thread::sleep_for(100ms);


[PERF] UTBot consumes CPU in spinlocks #382

alexey-utkin · 2022-08-23T06:39:24Z

server/src/Tests.h

        std::shared_ptr<PrimitiveValueView> primitiveView(const std::vector<char> &byteArray,
                                                          const types::Type &type,
                                                          size_t offset,
                                                          size_t len);
-        static std::shared_ptr<EnumValueView> enumView(const std::vector<char> &byteArray,


Group enum and struct-like. Seems they need to be joined in the future.

alexey-utkin · 2022-08-23T06:40:09Z

server/src/printers/KleeConstraintsPrinter.cpp

@@ -50,7 +47,7 @@ void KleeConstraintsPrinter::genConstraintsForPrimitive(const ConstraintsState &
    if (!cons.empty()) {
        strFunctionCall(PrinterUtils::KLEE_PREFER_CEX, { state.paramName, cons });
    } else {
-        ss << TAB_N() << "// No constraints for " << state.curElement << NL;
+        ss << LINE_INDENT() << "// No constraints for " << state.curElement << NL;


Indent can include the inline comment, so rename it to indent.

alexey-utkin · 2022-08-23T06:41:01Z

server/src/printers/KleeConstraintsPrinter.cpp

+        ConstraintsState newState = { state.paramName,
+                                      access,
+                                      field.type,
+                                      isStruct ? state.endString : false,


That is still essential difference between struct and union. Need to be investigated (in progress).

alexey-utkin · 2022-08-23T06:42:12Z

server/src/printers/KleeConstraintsPrinter.cpp

            break;
        case TypeKind::OBJECT_POINTER:
            if (types::TypesHandler::isArrayOfPointersToFunction(field.type)) {
-                genStubForStructFunctionPointerArray(state.curElement, field.name, stubFunctionName);
+                genStubForStructFunctionPointerArray(state.curElement, field,


no more just by name access. That leads to unpredictable errors.

alexey-utkin · 2022-08-23T06:43:56Z

server/src/printers/TestsPrinter.cpp

@@ -705,17 +705,33 @@ std::string printer::MultiLinePrinter::print(TestsPrinter *printer,
    std::stringstream structuredValuesWithPrefixes;
    structuredValuesWithPrefixes << "{" << NL;
    ++printer->tabsDepth;
+
+    int longestFieldIndexForUnionInit = view->getLongestFieldIndexForUnionInit();


So now we are printing all the fields in union, but commenting all, except the longest.

alexey-utkin · 2022-08-23T06:46:27Z

server/src/types/Types.cpp

@@ -864,12 +834,6 @@ types::TypesHandler::isSupportedType(const Type &type, TypeUsage usage, int dept
              return getTypeKind(type) == TypeKind::UNKNOWN;
            }
        },
-        {


the subject of bugfix.

alexey-utkin · 2022-08-23T06:46:58Z

server/src/types/Types.cpp

@@ -894,14 +858,10 @@ types::TypesHandler::isSupportedType(const Type &type, TypeUsage usage, int dept
                });
              };

-              if (isUnion(type)) {


Has no direct influence to the tests

alexey-utkin · 2022-08-23T06:47:26Z

server/src/types/Types.cpp

@@ -954,15 +914,10 @@ types::TypesHandler::isSupportedType(const Type &type, TypeUsage usage, int dept
                  return false;
                });
              };
-              if (isStruct(type)) {


Has no direct influence to the tests

alexey-utkin · 2022-08-23T06:48:20Z

server/src/types/Types.cpp

-std::string types::EnumInfo::getEntryName(const std::string &value, utbot::Language language) {
-    auto const& entry = valuesToEntries[value];
+std::string types::EnumInfo::getEntryName(const std::string &value, utbot::Language language) const {
+    const EnumEntry &entry = valuesToEntries.at(value);


Has no const operator[], so changed.

- fix for Syntax_Test.Union_With_Pointer_Test

ladisgin · 2022-08-23T14:35:55Z

server/src/Tests.cpp

-    : AbstractValueView(std::move(subViews)),
-      entryValue(PrinterUtils::convertBytesToUnion(typeName, rawDataView->getEntryValue(nullptr))) {
-}
+//UnionValueView::UnionValueView(


delete unused code

ladisgin · 2022-08-23T14:54:21Z

server/src/printers/TestsPrinter.cpp

+            structuredValuesWithPrefixes << printer->LINE_INDENT() << view->getFieldPrefix(i)
+                                         << sview->getEntryValue(printer);
+        }
+        else {


fold the line

ladisgin · 2022-08-23T14:58:59Z

server/src/types/Types.h

    struct StructInfo: TypeInfo {
        std::vector<Field> fields{};
-
+        int longestFieldIndexForUnionInit;


try make size_t

ladisgin · 2022-08-23T14:59:59Z

server/src/types/Types.h

-         * @return UnionInfo for given union.
-         */
-        UnionInfo getUnionInfo(const Type&) const;
-
        bool isStruct(uint64_t id) const;


rename to isStructLike

- refactoring of StructView

Not support anonymous union in struct #317

a87c6a7

alexey-utkin linked an issue Aug 22, 2022 that may be closed by this pull request

Not support anonymous union in struct #317

Closed

Not support anonymous union in struct #317

a161fe2

- better tests for union printer - less divergent between struct and union

alexey-utkin requested a review from ladisgin August 23, 2022 06:34

alexey-utkin commented Aug 23, 2022

View reviewed changes

Not support anonymous union in struct #317

a48a989

- fix for Syntax_Test.Union_With_Pointer_Test

ladisgin requested changes Aug 23, 2022

View reviewed changes

Vladislav Kalugin and others added 4 commits August 24, 2022 16:23

Switch to ubuntu-latest

e7092ce

Switch to klee 2.3, increase timeout for sort_list tests

04fcb52

Increase timelimits

6fedba2

Not support anonymous union in struct #317

b1b09b1

- refactoring of StructView

ladisgin approved these changes Aug 24, 2022

View reviewed changes

alexey-utkin merged commit ca3734f into main Aug 24, 2022

alexey-utkin deleted the alexey-utkin/unnamedUnion branch August 24, 2022 16:08

Not support anonymous union in struct #317 #391

Not support anonymous union in struct #317 #391

Uh oh!

Conversation

alexey-utkin commented Aug 22, 2022

Uh oh!

alexey-utkin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!